Reversing changes WL#10495 : Deprecate writing to multiple replicated engines, when at least one is non-transactional or non-composable

Reversed the previous accidental push

Change-Id: I3512f03d5dafee5e17c6a0ee485de7226244dbb8

Author: Arpit Goswami

mysql-test/r/flush_read_lock.result

@@ -1540,8 +1540,6 @@ alter table t1_temp drop column c1;
 begin;
 insert into t1_base values (1);
 insert into t3_trans values (1);
-Warnings:
-Warning	6136	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,8 +180,6 @@ 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	6136	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,8 +963,6 @@ UNLOCK TABLES;
 # 2.c) Blocks concurrent modifications to table
 connection default;
 LOCK TABLE t1 WRITE, t2 WRITE;
-Warnings:
-Warning	6136	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);
@@ -2101,8 +2099,6 @@ i
 1
 connection default;
 LOCK TABLE t8 WRITE;
-Warnings:
-Warning	6136	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;;
@@ -2169,15 +2165,11 @@ RELEASE_LOCK('mysqltest_lock')
 1
 connection con2;
 # Reaping LOCK TABLE WRITE
-Warnings:
-Warning	6136	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	6136	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);
@@ -2248,8 +2240,6 @@ RELEASE_LOCK('mysqltest_lock')
 1
 connection con2;
 # Reaping LOCK TABLES WRITE
-Warnings:
-Warning	6136	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
@@ -2286,8 +2276,6 @@ connection default;
 COMMIT;
 connection con1;
 # Reap LOCK TABLES WRITE
-Warnings:
-Warning	6136	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;
 #
@@ -2317,8 +2305,6 @@ connection default;
 COMMIT;
 connection con1;
 # Reap LOCK TABLES WRITE
-Warnings:
-Warning	6136	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
@@ -2340,8 +2326,6 @@ connection con1;
 UNLOCK TABLES;
 connection default;
 LOCK TABLES t8 WRITE;
-Warnings:
-Warning	6136	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,8 +1179,6 @@ 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	6136	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
@@ -1201,8 +1199,6 @@ 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	6136	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,7 +190,6 @@ 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
 #
@@ -231,7 +230,6 @@ 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,8 +103,6 @@ SELECT * FROM t1;
 a	b
 1	init+con1
 # Switch to connection con2
-Warnings:
-Warning	6136	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
@@ -132,8 +130,6 @@ SELECT * FROM t1;
 a	b
 2	init+con1
 # Switch to connection con2
-Warnings:
-Warning	6136	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,8 +24,6 @@ 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	6136	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: #)
@@ -74,8 +72,6 @@ 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	6136	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: #)

mysql-test/r/rename_myisam.result

@@ -33,8 +33,6 @@ CREATE TABLE t2 (j INT) ENGINE=InnoDB;
 CREATE TABLE t3 (k INT) ENGINE=InnoDB;
 CREATE TABLE t4 (l INT) ENGINE=InnoDB;
 LOCK TABLES t1 WRITE, t2 WRITE, t3 WRITE, t0 WRITE;
-Warnings:
-Warning	6136	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.
 RENAME TABLES t0 TO t00, t1 TO t01, t2 TO t4;
 ERROR 42S01: Table 't4' already exists
 # Tables are available under old names.
@@ -153,8 +151,6 @@ UNLOCK TABLES;
 #      state of metadata locks too.
 # This part of the test resides in rename_myisam.test.
 LOCK TABLES t4 WRITE, t1 WRITE;
-Warnings:
-Warning	6136	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.t4.
 RENAME TABLES t4 TO mysqltest.t4, t1 TO t3;
 ERROR 42S01: Table 't3' already exists
 # Tables are available under old names.

mysql-test/r/session_tracker_trx_state_myisam.result

@@ -64,8 +64,6 @@ START TRANSACTION;
 INSERT INTO t1 VALUES (1);
 # resulting state should be "wW", both safe and unsafe writes happened:
 INSERT INTO t2 VALUES (1);
-Warnings:
-Warning	6136	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.
 # resulting state should STILL be "wW"!
 INSERT INTO t1 VALUES (1);
 ROLLBACK;
@@ -76,8 +74,6 @@ START TRANSACTION;
 INSERT INTO t2 VALUES (1);
 # resulting state should be "wW", both safe and unsafe writes happened:
 INSERT INTO t1 VALUES (1);
-Warnings:
-Warning	6136	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.t2.
 # resulting state should be  "RwW" (adding transactional read):
 SELECT f1 FROM t1;
 f1
@@ -139,8 +135,6 @@ CREATE TABLE t1 (f1 INT) ENGINE="InnoDB";
 CREATE TABLE t2 (f1 INT) ENGINE="MyISAM";
 BEGIN;
 COMMIT; INSERT INTO t2 VALUES (1); BEGIN; INSERT INTO t1 VALUES (99); |
-Warnings:
-Warning	6136	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.t2.
 COMMIT;
 DROP TABLE t1;
 DROP TABLE t2;
@@ -372,12 +366,8 @@ UNLOCK TABLES;
 
 SET autocommit=1;
 LOCK TABLE t1 WRITE, t2 WRITE;
-Warnings:
-Warning	6136	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.
 INSERT INTO t2 VALUES (3);
 INSERT INTO t1 VALUES (3);
-Warnings:
-Warning	6136	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.t2.
 SELECT f1 FROM t1 WHERE f1 > 2;
 f1
 3

mysql-test/r/sp.result

@@ -6109,15 +6109,11 @@ set @a=@a+1;
 return @a;
 end|
 update t2 set b=1 where a=bug27354();
-Warnings:
-Warning	6136	Combining the storage engines MyISAM and InnoDB is deprecated, but the statement or transaction updates both the MyISAM table test.t1 and the InnoDB table test.t2.
 select count(t_1.a),count(t_2.a) from t1 as t_1, t2 as t_2 /* must be 0,0 */;
 count(t_1.a)	count(t_2.a)
 0	0
 insert into t2 values (1,1),(2,2),(3,3);
 update t2 set b=-b where a=bug27354();
-Warnings:
-Warning	6136	Combining the storage engines MyISAM and InnoDB is deprecated, but the statement or transaction updates both the MyISAM table test.t1 and the InnoDB table test.t2.
 select * from t2 /* must return 1,-1 ... */;
 a	b
 1	-1