fix(mtr):Resolve the nightly run error problem(#1458)

stoneatom · Mar 22, 2023 · dd8247b · dd8247b
1 parent 0a2f9be
commit dd8247b
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 2 deletions.
diff --git a/mysql-test/suite/tianmu/r/issue1111.result b/mysql-test/suite/tianmu/r/issue1111.result
@@ -29,6 +29,13 @@ id	name
 1	lllll
 [on slave]
 include/sync_slave_sql_with_master.inc
+show create table ttt;
+Table	Create Table
+ttt	CREATE TABLE `ttt` (
+  `id` int(11) NOT NULL,
+  `name` varchar(64) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=TIANMU DEFAULT CHARSET=latin1
 select * from ttt where id in(1,3,2) order by id desc;
 id	name
 3	lllll

diff --git a/mysql-test/suite/tianmu/r/issue1174.result b/mysql-test/suite/tianmu/r/issue1174.result
@@ -31,6 +31,13 @@ id	name
 0	lllll
 [on slave]
 include/sync_slave_sql_with_master.inc
+show create table ttt;
+Table	Create Table
+ttt	CREATE TABLE `ttt` (
+  `id` int(11) NOT NULL,
+  `name` varchar(64) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=TIANMU DEFAULT CHARSET=latin1
 select * from ttt where id in(1,3,2,0) order by id desc;
 id	name
 3	lllll

diff --git a/mysql-test/suite/tianmu/t/issue1111-slave.opt b/mysql-test/suite/tianmu/t/issue1111-slave.opt
@@ -0,0 +1 @@
+--sql_mode='NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION,MANDATORY_TIANMU,NO_KEY_ERROR'
diff --git a/mysql-test/suite/tianmu/t/issue1111.testbak → mysql-test/suite/tianmu/t/issue1111.test b/mysql-test/suite/tianmu/t/issue1111.testbak → mysql-test/suite/tianmu/t/issue1111.test
@@ -10,7 +10,6 @@ drop table if exists `t3`;
 -- source include/master-slave.inc
 --enable_warnings
 
-
 --echo #
 --echo # Has primary key
 --echo # 
@@ -34,6 +33,7 @@ update ttt set name='lllll' where id in(1,3,2);
 select * from ttt where id in(1,3,2) order by id desc;
 --echo [on slave]
 --source include/sync_slave_sql_with_master.inc
+show create table ttt;
 select * from ttt where id in(1,3,2) order by id desc;
 --echo [on master]
 connection master;

diff --git a/mysql-test/suite/tianmu/t/issue1174-slave.opt b/mysql-test/suite/tianmu/t/issue1174-slave.opt
@@ -0,0 +1 @@
+--sql_mode='NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION,MANDATORY_TIANMU,NO_KEY_ERROR'
diff --git a/mysql-test/suite/tianmu/t/issue1174.test b/mysql-test/suite/tianmu/t/issue1174.test
@@ -10,7 +10,6 @@ drop table if exists `t3`;
 -- source include/master-slave.inc
 --enable_warnings
 
-
 --echo #
 --echo # Has primary key
 --echo # 
@@ -35,6 +34,7 @@ update ttt set name='lllll' where id in(1,3,2,0);
 select * from ttt where id in(1,3,2,0) order by id desc;
 --echo [on slave]
 --source include/sync_slave_sql_with_master.inc
+show create table ttt;
 select * from ttt where id in(1,3,2,0) order by id desc;
 --echo [on master]
 connection master;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		--sql_mode='NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION,MANDATORY_TIANMU,NO_KEY_ERROR'