Merge branch 'mysql-8.0' into mysql-8.4

Change-Id: I6eac134fc97069f2d4106a66a1707f7092475500

Author: Sai Tharun Ambati

mysql-test/suite/innodb/r/cross_ddl_partition_tables.result

@@ -0,0 +1,37 @@
+# Create database and tables
+CREATE DATABASE testdb;
+USE testdb;
+CREATE TABLE t1 ( id int );
+INSERT INTO t1 VALUES (1);
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+CREATE TABLE t2 ( id int );
+INSERT INTO t2 SELECT * FROM t1;
+CREATE TABLE t3 (
+id INT
+)
+PARTITION BY RANGE (id) (
+PARTITION p0 VALUES LESS THAN (1000),
+PARTITION p1 VALUES LESS THAN (2000),
+PARTITION p2 VALUES LESS THAN (3000)
+);
+INSERT INTO t3 VALUES (800);
+INSERT INTO t3 VALUES (1500);
+INSERT INTO t3 VALUES (2300);
+BEGIN;
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+32
+# Alter the partition table.
+ALTER TABLE testdb.t3 ADD COLUMN name varchar(10);
+# SELECT COUNT(*) must fail as the table definition is changed.
+SELECT COUNT(*) FROM testdb.t3;
+ERROR HY000: Table definition has changed, please retry transaction
+# SELECT * must fail as the table definition is changed.
+SELECT * FROM testdb.t3;
+ERROR HY000: Table definition has changed, please retry transaction
+# Clean up
+DROP DATABASE testdb;

mysql-test/suite/innodb/t/cross_ddl_partition_tables.test

@@ -0,0 +1,46 @@
+--connect (con1,localhost,root,,)
+--echo # Create database and tables
+CREATE DATABASE testdb;
+USE testdb;
+
+CREATE TABLE t1 ( id int );
+INSERT INTO t1 VALUES (1);
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+
+CREATE TABLE t2 ( id int );
+INSERT INTO t2 SELECT * FROM t1;
+
+CREATE TABLE t3 (
+    id INT
+)
+PARTITION BY RANGE (id) (
+    PARTITION p0 VALUES LESS THAN (1000),
+    PARTITION p1 VALUES LESS THAN (2000),
+    PARTITION p2 VALUES LESS THAN (3000)
+);
+INSERT INTO t3 VALUES (800);
+INSERT INTO t3 VALUES (1500);
+INSERT INTO t3 VALUES (2300);
+
+BEGIN;
+SELECT COUNT(*) FROM t1;
+
+--connect (con2,localhost,root,,)
+--echo # Alter the partition table.
+ALTER TABLE testdb.t3 ADD COLUMN name varchar(10);
+
+--connection con1
+--echo # SELECT COUNT(*) must fail as the table definition is changed.
+--error ER_TABLE_DEF_CHANGED
+SELECT COUNT(*) FROM testdb.t3;
+
+--echo # SELECT * must fail as the table definition is changed.
+--error ER_TABLE_DEF_CHANGED
+SELECT * FROM testdb.t3;
+
+--echo # Clean up
+DROP DATABASE testdb;

storage/innobase/handler/ha_innopart.cc

@@ -3215,6 +3215,12 @@ int ha_innopart::records(ha_rows *num_rows) {
         return (HA_ERR_NO_SUCH_TABLE);
       }
 
+      m_prebuilt->index_usable = m_prebuilt->index->is_usable(trx);
+      if (!m_prebuilt->index_usable) {
+        *num_rows = HA_POS_ERROR;
+        return HA_ERR_TABLE_DEF_CHANGED;
+      }
+
       build_template(true);
 
       indexes.push_back(m_prebuilt->table->first_index());