WL#10495 Replication Usability: Deprecate writing multiple engines when atleast one

is non-transactional or non-composable This worklog deprecates writing transactions/statements to tables associated to multiple engines if atleast one is non-transactional or non-composable engine. Change-Id: I512abd7f7adda768a5b3e8e4b43b6245f6bf0b22

Author: Arpit Goswami

mysql-test/common/binlog/enforce_gtid_consistency_statement.inc

@@ -81,6 +81,10 @@ if ($extra_warning_count == '')
 {
  --let $extra_warning_count= 0
 }
+if ($mix_engine_warning_count == '')
+{
+ --let $mix_engine_warning_count= 0
+}
 
 # $expected_status is 0 if the statement is ok, 1 if an error is expected,
 # 2 if a warning is expected.
@@ -159,11 +163,12 @@ if ($expected_status != 1)
 }
 
 # Check warnings / errors.
-
+--connection $auxiliary_connection
+--let $warning_index= `SELECT 1 + $mix_engine_warning_count`
 --connection $statement_connection
 --let $warning_count= `SHOW COUNT(*) WARNINGS`
---let $warning_message= query_get_value(SHOW WARNINGS, Message, 1)
---let $warning_level= query_get_value(SHOW WARNINGS, Level, 1)
+--let $warning_message= query_get_value(SHOW WARNINGS, Message, $warning_index)
+--let $warning_level= query_get_value(SHOW WARNINGS, Level, $warning_index)
 
 --connection $auxiliary_connection
 
@@ -182,7 +187,7 @@ if ($expected_status == 0)
 if ($expected_status == 1)
 {
  --let $assert_text= One warning/error should be generated.
- --let $assert_cond= $warning_count = 1
+ --let $assert_cond= $warning_count = 1 + $mix_engine_warning_count
  --source include/assert.inc
 
  --let $assert_text= It should be an Error, not a Warning.

mysql-test/common/binlog/enforce_gtid_consistency_trx_nontrx_consistent.test

@@ -18,13 +18,16 @@ if ($gtid_next != 'GTID')
  --echo ---- MyISAM followed by MyISAM, in one 'trx' ----
  --let $pre_statement= BEGIN; INSERT INTO myisam1 VALUES (1)
  --let $statement= INSERT INTO myisam2 VALUES (1)
-
+ #Mixing of same engine so no warning
+ --let $extra_warning_count= 0
  --source common/binlog/enforce_gtid_consistency_statement.inc
 }
 
 --echo ---- MyISAM and MyISAM in one statement ----
 CREATE TRIGGER trig BEFORE INSERT ON myisam1 FOR EACH ROW INSERT INTO myisam2 VALUES (1);
 --let $statement= INSERT INTO myisam2 VALUES (1)
+#Mixing of same engine so no warning
+--let $extra_warning_count= 0
 --source common/binlog/enforce_gtid_consistency_statement.inc
 DROP TRIGGER trig;
 
@@ -38,6 +41,8 @@ if ($gtid_next != 'GTID')
  --echo ---- MyISAM followed by InnoDB, in one 'trx' ----
  --let $pre_statement= BEGIN; INSERT INTO myisam1 VALUES (1)
  --let $statement= INSERT INTO innodb VALUES (1)
+ #Mixing of non-composable engine so 1 warning
+ --let $extra_warning_count = 1
  --source common/binlog/enforce_gtid_consistency_statement.inc
 }
 
@@ -59,6 +64,8 @@ SET SESSION BINLOG_FORMAT = MIXED;
 CREATE TEMPORARY TABLE tmp_myisam1 (a INT) ENGINE = MyISAM;
 --let $pre_statement= BEGIN; INSERT INTO innodb VALUES (1)
 --let $statement= INSERT INTO tmp_myisam1 VALUES (1)
+#Mixing of non-composable engine so 1 warning
+--let $extra_warning_count = 1
 --source common/binlog/enforce_gtid_consistency_statement.inc
 DROP TEMPORARY TABLE tmp_myisam1;
 
@@ -73,6 +80,8 @@ CREATE TEMPORARY TABLE tmp_myisam1 (a INT) ENGINE = MyISAM;
 CREATE TEMPORARY TABLE tmp_myisam2 (a INT) ENGINE = MyISAM;
 --eval CREATE TRIGGER trig BEFORE INSERT ON innodb FOR EACH ROW BEGIN INSERT INTO tmp_myisam1 VALUES (1); INSERT INTO tmp_myisam2 VALUES (1); END
 --let $statement= INSERT INTO innodb VALUES (1)
+#Mixing of non-composable engine so 1 warning
+--let $extra_warning_count = 1
 --source common/binlog/enforce_gtid_consistency_statement.inc
 DROP TRIGGER trig;
 DROP TEMPORARY TABLE tmp_myisam1, tmp_myisam2;
@@ -84,11 +93,15 @@ CREATE TEMPORARY TABLE tmp_myisam2 (a INT) ENGINE = MyISAM;
 --echo ---- InnoDB followed by temp MyISAM in one trx, binlog_format='row' ----
 --let $pre_statement= BEGIN; INSERT INTO innodb VALUES (1)
 --let $statement= INSERT INTO tmp_myisam1 VALUES (1)
+#Mixing of non-composable engine so 1 warning
+--let $extra_warning_count = 1
 --source common/binlog/enforce_gtid_consistency_statement.inc
 
 --echo ---- InnoDB and temp MyISAM in one statement, binlog_format='row' ----
 --eval CREATE TRIGGER trig BEFORE INSERT ON innodb FOR EACH ROW BEGIN INSERT INTO tmp_myisam1 VALUES (1); INSERT INTO tmp_myisam2 VALUES (1); END
 --let $statement= INSERT INTO innodb VALUES (1)
+#Mixing of non-composable engine so 1 warning
+--let $extra_warning_count = 1
 --source common/binlog/enforce_gtid_consistency_statement.inc
 DROP TRIGGER trig;
 
@@ -110,18 +123,24 @@ SET SQL_LOG_BIN = 0;
 --echo ---- InnoDB and MyISAM in one statement, SQL_LOG_BIN=0 ----
 --eval CREATE TRIGGER trig BEFORE INSERT ON innodb FOR EACH ROW BEGIN INSERT INTO myisam1 VALUES (1); INSERT INTO myisam2 VALUES (1); END
 --let $statement= INSERT INTO innodb VALUES (1)
+#Mixing of non-composable engine so 1 warning
+--let $extra_warning_count = 1
 --source common/binlog/enforce_gtid_consistency_statement.inc
 DROP TRIGGER trig;
 
 --echo ---- InnoDB followed by MyISAM, in one trx, SQL_LOG_BIN=0 ----
 --let $pre_statement= BEGIN; INSERT INTO innodb VALUES (1)
 --let $statement= INSERT INTO myisam1 VALUES (1)
+#Mixing of non-composable engine so 1 warning
+--let $extra_warning_count = 1
 --source common/binlog/enforce_gtid_consistency_statement.inc
 
 --echo ---- InnoDB and MyISAM in one statement inside trx, SQL_LOG_BIN=0 ----
 --eval CREATE TRIGGER trig BEFORE INSERT ON innodb FOR EACH ROW BEGIN INSERT INTO myisam1 VALUES (1); INSERT INTO myisam2 VALUES (1); END
 --let $pre_statement= BEGIN
 --let $statement= INSERT INTO innodb VALUES (1)
+#Mixing of non-composable engine so 1 warning
+--let $extra_warning_count = 1
 --source common/binlog/enforce_gtid_consistency_statement.inc
 DROP TRIGGER trig;
 

mysql-test/common/binlog/enforce_gtid_consistency_trx_nontrx_violation.test

@@ -3,7 +3,8 @@
 --let $error_message= Statement violates GTID consistency: Updates to non-transactional tables
 --let $sync_point= end_decide_logging_format
 --let $statement_ends_transaction= 0
-
+--let $extra_warning_count = 0
+--let $mix_engine_warning_count = 1
 CREATE TABLE myisam1 (a INT) ENGINE = MyISAM;
 CREATE TABLE myisam2 (a INT) ENGINE = MyISAM;
 CREATE TABLE innodb (a INT) ENGINE = InnoDB;
@@ -25,6 +26,7 @@ if ($binlog_direct_non_transactional_updates == 0)
 --disable_warnings
 --let $pre_statement= BEGIN; INSERT INTO innodb VALUES (1)
 --let $statement= INSERT INTO myisam1 VALUES (1)
+--expr $extra_warning_count = $extra_warning_count + $mix_engine_warning_count
 --source common/binlog/enforce_gtid_consistency_statement.inc
 --enable_warnings
 --let $extra_warning_count= 0
@@ -33,7 +35,10 @@ if ($binlog_direct_non_transactional_updates == 0)
 CREATE TRIGGER trig BEFORE INSERT ON innodb FOR EACH ROW INSERT INTO myisam1 VALUES (1);
 --let $statement= INSERT INTO innodb VALUES (1)
 --let $statement_ends_transaction= 1
+# Mixing of non-composable engine
+--let $extra_warning_count= $mix_engine_warning_count
 --source common/binlog/enforce_gtid_consistency_statement.inc
+--let $extra_warning_count= 0
 
 --echo ---- InnoDB and MyISAM in one statement inside trx ----
 # If binlog_format==STATEMENT, there is a warning for unsafe statement.
@@ -46,6 +51,8 @@ if ($binlog_format == 'STATEMENT')
 --let $pre_statement= BEGIN
 --let $statement= INSERT INTO innodb VALUES (1)
 --let $statement_ends_transaction= 0
+# Mixing of non-composable engine
+--expr $extra_warning_count= $extra_warning_count + $mix_engine_warning_count
 --source common/binlog/enforce_gtid_consistency_statement.inc
 DROP TRIGGER trig;
 --let $extra_warning_count= 0
@@ -65,12 +72,16 @@ CREATE TEMPORARY TABLE tmp_myisam2 (a INT) ENGINE = MyISAM;
 --let $pre_statement= BEGIN; INSERT INTO innodb VALUES (1)
 --let $statement= INSERT INTO tmp_myisam1 VALUES (1)
 --let $statement_ends_transaction= 0
+# Mixing of non-composable engine
+--let $extra_warning_count= $mix_engine_warning_count
 --source common/binlog/enforce_gtid_consistency_statement.inc
 
 --echo ---- InnoDB and temp MyISAM in one autocommit statement, binlog_format=stm ----
 CREATE TRIGGER trig BEFORE INSERT ON innodb FOR EACH ROW INSERT INTO tmp_myisam1 VALUES (1);
 --let $statement= INSERT INTO innodb VALUES (1)
 --let $statement_ends_transaction= 1
+# Mixing of non-composable engine
+--let $extra_warning_count= $mix_engine_warning_count
 --source common/binlog/enforce_gtid_consistency_statement.inc
 
 --echo ---- InnoDB and temp MyISAM in one statement inside trx, binlog_format=stm ----

mysql-test/r/flush_read_lock.result

@@ -1540,6 +1540,8 @@ alter table t1_temp drop column c1;
 begin;
 insert into t1_base values (1);
 insert into t3_trans values (1);
+Warnings:
+Warning	6414	Combining the storage engines InnoDB and MyISAM is deprecated, but the statement or transaction updates both the InnoDB table test.t3_trans and the MyISAM table test.t1_base.
 # Switching to connection 'con1'.
 # The below FTWRL should not be blocked by transaction in 'default'.
 flush tables with read lock;

mysql-test/r/foreign_key_myisam.result

@@ -180,6 +180,8 @@ ALTER TABLE parent ENGINE=InnoDB;
 ERROR HY000: Table 'child' was locked with a READ lock and can't be updated
 UNLOCK TABLES;
 LOCK TABLES child WRITE, parent WRITE;
+Warnings:
+Warning	6414	Combining the storage engines MyISAM and InnoDB is deprecated, but the statement or transaction updates both the MyISAM table test.parent and the InnoDB table test.child.
 ALTER TABLE parent ENGINE=InnoDB;
 UNLOCK TABLES;
 DROP TABLES child, parent;

mysql-test/r/lock_multi.result

@@ -963,6 +963,8 @@ UNLOCK TABLES;
 # 2.c) Blocks concurrent modifications to table
 connection default;
 LOCK TABLE t1 WRITE, t2 WRITE;
+Warnings:
+Warning	6414	Combining the storage engines InnoDB and MyISAM is deprecated, but the statement or transaction updates both the InnoDB table test.t2 and the MyISAM table test.t1.
 connection con1;
 # Sending:
 INSERT INTO t1 VALUES (1);
@@ -2099,6 +2101,8 @@ i
 1
 connection default;
 LOCK TABLE t8 WRITE;
+Warnings:
+Warning	6414	Combining the storage engines InnoDB and MyISAM is deprecated, but the statement or transaction updates both the InnoDB table test.t2 and the MyISAM table test.t8.
 connection con1;
 # Sending:
 SELECT * FROM t2;;
@@ -2165,11 +2169,15 @@ RELEASE_LOCK('mysqltest_lock')
 1
 connection con2;
 # Reaping LOCK TABLE WRITE
+Warnings:
+Warning	6414	Combining the storage engines InnoDB and MyISAM is deprecated, but the statement or transaction updates both the InnoDB table test.t2 and the MyISAM table test.t8.
 UNLOCK TABLES;
 #
 # 7.c) Blocks concurrent modifications to table
 connection default;
 LOCK TABLE t7 WRITE, t8 WRITE;
+Warnings:
+Warning	6414	Combining the storage engines InnoDB and MyISAM is deprecated, but the statement or transaction updates both the InnoDB table test.t2 and the MyISAM table test.t7.
 connection con1;
 # Sending:
 INSERT INTO t1 VALUES (1);
@@ -2240,6 +2248,8 @@ RELEASE_LOCK('mysqltest_lock')
 1
 connection con2;
 # Reaping LOCK TABLES WRITE
+Warnings:
+Warning	6414	Combining the storage engines InnoDB and MyISAM is deprecated, but the statement or transaction updates both the InnoDB table test.t2 and the MyISAM table test.t8.
 UNLOCK TABLES;
 connection default;
 # Revert effects from INSERTs
@@ -2276,6 +2286,8 @@ connection default;
 COMMIT;
 connection con1;
 # Reap LOCK TABLES WRITE
+Warnings:
+Warning	6414	Combining the storage engines InnoDB and MyISAM is deprecated, but the statement or transaction updates both the InnoDB table test.t2 and the MyISAM table test.t8.
 UNLOCK TABLES;
 connection default;
 #
@@ -2305,6 +2317,8 @@ connection default;
 COMMIT;
 connection con1;
 # Reap LOCK TABLES WRITE
+Warnings:
+Warning	6414	Combining the storage engines InnoDB and MyISAM is deprecated, but the statement or transaction updates both the InnoDB table test.t2 and the MyISAM table test.t8.
 UNLOCK TABLES;
 connection default;
 # Revert effects from INSERTs
@@ -2326,6 +2340,8 @@ connection con1;
 UNLOCK TABLES;
 connection default;
 LOCK TABLES t8 WRITE;
+Warnings:
+Warning	6414	Combining the storage engines InnoDB and MyISAM is deprecated, but the statement or transaction updates both the InnoDB table test.t2 and the MyISAM table test.t8.
 connection con1;
 # Sending:
 LOCK TABLES t2 WRITE;;

mysql-test/r/mix2_myisam.result

@@ -1179,6 +1179,8 @@ CREATE TABLE t1 ( B_ID INTEGER NOT NULL PRIMARY KEY) ENGINE=MyISAM;
 SET AUTOCOMMIT=0;
 INSERT INTO t1 ( B_ID ) VALUES ( 1 );
 INSERT INTO t2 ( NEXT_T ) VALUES ( 1 );
+Warnings:
+Warning	6414	Combining the storage engines MEMORY and MyISAM is deprecated, but the statement or transaction updates both the MEMORY table test.t2 and the MyISAM table test.t1.
 ROLLBACK;
 Warnings:
 Warning	1196	Some non-transactional changed tables couldn't be rolled back
@@ -1199,6 +1201,8 @@ create table t1 (a int not null auto_increment primary key, b int, c int, key(c)
 create table t2 (a int not null auto_increment primary key, b int) ENGINE = MEMORY;
 insert into t1 (b) values (null),(null),(null),(null),(null),(null),(null);
 insert into t2 (a) select b from t1;
+Warnings:
+Warning	6414	Combining the storage engines MEMORY and MyISAM is deprecated, but the statement or transaction updates both the MEMORY table test.t2 and the MyISAM table test.t1.
 insert into t1 (b) select b from t2;
 insert into t2 (a) select b from t1;
 insert into t1 (a) select b from t2;

mysql-test/r/no_binlog_gtid_next_partially_failed_stmts.result

@@ -190,6 +190,7 @@ SET SESSION GTID_NEXT='MASTER_UUID:7';
 OPTIMIZE TABLE t1, t_non_existent;
 Table	Op	Msg_type	Msg_text
 test.t1	optimize	status	Table is already up to date
+test.t_non_existent	optimize	Warning	Combining the storage engines InnoDB and MyISAM is deprecated, but the statement or transaction updates both the InnoDB table mysql.gtid_executed and the MyISAM table test.t1.
 test.t_non_existent	optimize	Error	Table 'test.t_non_existent' doesn't exist
 test.t_non_existent	optimize	status	Operation failed
 #
@@ -230,6 +231,7 @@ SET SESSION GTID_NEXT='MASTER_UUID:9';
 REPAIR TABLE t1, t_non_existent;
 Table	Op	Msg_type	Msg_text
 test.t1	repair	status	OK
+test.t_non_existent	repair	Warning	Combining the storage engines InnoDB and MyISAM is deprecated, but the statement or transaction updates both the InnoDB table mysql.gtid_executed and the MyISAM table test.t1.
 test.t_non_existent	repair	Error	Table 'test.t_non_existent' doesn't exist
 test.t_non_existent	repair	status	Operation failed
 #

mysql-test/r/partition_innodb_semi_consistent.result

@@ -103,6 +103,8 @@ SELECT * FROM t1;
 a	b
 1	init+con1
 # Switch to connection con2
+Warnings:
+Warning	6414	Combining the storage engines MyISAM and InnoDB is deprecated, but the statement or transaction updates both the MyISAM table test.t2 and the InnoDB table test.t1.
 SELECT * FROM t1;
 a	b
 1	init+con1+con2
@@ -130,6 +132,8 @@ SELECT * FROM t1;
 a	b
 2	init+con1
 # Switch to connection con2
+Warnings:
+Warning	6414	Combining the storage engines MyISAM and InnoDB is deprecated, but the statement or transaction updates both the MyISAM table test.t2 and the InnoDB table test.t1.
 SELECT * FROM t1;
 a	b
 2	init+con1

mysql-test/r/rename_debug_myisam.result

@@ -24,6 +24,8 @@ CREATE TABLE t0 (m INT) ENGINE=MyISAM;
 # from the set of locked tables. Metadata locks on both
 # old and new table names are kept.
 LOCK TABLES t1 WRITE, t2 WRITE, t0 WRITE;
+Warnings:
+Warning	6414	Combining the storage engines MyISAM and InnoDB is deprecated, but the statement or transaction updates both the MyISAM table test.t0 and the InnoDB table test.t1.
 SET @@debug='+d,injecting_fault_writing';
 RENAME TABLES t0 TO t00, t1 TO t01;
 ERROR HY000: Error writing file 'binlog' ((errno: #)
@@ -72,6 +74,8 @@ CREATE TABLE t1 (i INT) ENGINE=InnoDB;
 CREATE TABLE t0 (l INT) ENGINE=MyISAM;
 CREATE DATABASE mysqltest;
 LOCK TABLES t0 WRITE, t1 WRITE;
+Warnings:
+Warning	6414	Combining the storage engines InnoDB and MyISAM is deprecated, but the statement or transaction updates both the InnoDB table test.t1 and the MyISAM table test.t0.
 SET @@debug='+d,injecting_fault_writing';
 RENAME TABLES t0 TO mysqltest.t0, t1 TO t01;
 ERROR HY000: Error writing file 'binlog' ((errno: #)