diff options
Diffstat (limited to 'mysql-test/suite/engines/funcs')
12 files changed, 93 insertions, 14 deletions
diff --git a/mysql-test/suite/engines/funcs/r/rpl_000010.result b/mysql-test/suite/engines/funcs/r/rpl_000010.result index a86d71bd..0b3a67bf 100644 --- a/mysql-test/suite/engines/funcs/r/rpl_000010.result +++ b/mysql-test/suite/engines/funcs/r/rpl_000010.result @@ -16,4 +16,5 @@ n connection master; drop table t1; connection slave; +include/wait_for_slave_to_start.inc include/rpl_end.inc diff --git a/mysql-test/suite/engines/funcs/r/rpl_drop_db.result b/mysql-test/suite/engines/funcs/r/rpl_drop_db.result index 3712527a..1b132c20 100644 --- a/mysql-test/suite/engines/funcs/r/rpl_drop_db.result +++ b/mysql-test/suite/engines/funcs/r/rpl_drop_db.result @@ -6,8 +6,6 @@ create database mysqltest1; create table mysqltest1.t1 (n int); insert into mysqltest1.t1 values (1); select * from mysqltest1.t1 into outfile 'mysqltest1/f1.txt'; -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead create table mysqltest1.t2 (n int); create table mysqltest1.t3 (n int); drop database mysqltest1; diff --git a/mysql-test/suite/engines/funcs/r/rpl_dual_pos_advance.result b/mysql-test/suite/engines/funcs/r/rpl_dual_pos_advance.result index ed9060f8..dd25cdc4 100644 --- a/mysql-test/suite/engines/funcs/r/rpl_dual_pos_advance.result +++ b/mysql-test/suite/engines/funcs/r/rpl_dual_pos_advance.result @@ -3,7 +3,7 @@ include/master-slave.inc connection slave; reset master; connection master; -change master to master_host="127.0.0.1",master_port=SLAVE_PORT,master_user="root"; +change master to master_host="127.0.0.1",master_port=SLAVE_PORT,master_user="root",master_ssl_verify_server_cert=0; include/start_slave.inc connection slave; create table t1 (n int); @@ -25,4 +25,5 @@ include/stop_slave.inc reset slave; drop table t1,t4,t5,t6; connection slave; +include/wait_for_slave_to_start.inc include/rpl_end.inc diff --git a/mysql-test/suite/engines/funcs/r/rpl_flushlog_loop.result b/mysql-test/suite/engines/funcs/r/rpl_flushlog_loop.result index 527dd8dc..56e428b3 100644 --- a/mysql-test/suite/engines/funcs/r/rpl_flushlog_loop.result +++ b/mysql-test/suite/engines/funcs/r/rpl_flushlog_loop.result @@ -3,11 +3,11 @@ include/master-slave.inc connection slave; include/stop_slave.inc change master to master_host='127.0.0.1',master_user='root', -master_password='',master_port=MASTER_PORT; +master_password='',master_port=MASTER_PORT, master_ssl_verify_server_cert=0; include/start_slave.inc connection master; change master to master_host='127.0.0.1',master_user='root', -master_password='',master_port=SLAVE_PORT; +master_password='',master_port=SLAVE_PORT, master_ssl_verify_server_cert=0; include/start_slave.inc flush logs; include/stop_slave.inc diff --git a/mysql-test/suite/engines/funcs/r/rpl_misc_functions.result b/mysql-test/suite/engines/funcs/r/rpl_misc_functions.result index 302cf235..6c20623d 100644 --- a/mysql-test/suite/engines/funcs/r/rpl_misc_functions.result +++ b/mysql-test/suite/engines/funcs/r/rpl_misc_functions.result @@ -42,8 +42,6 @@ INSERT INTO t1 (col_a) VALUES (test_replication_sf()); INSERT INTO t1 (col_a) VALUES (test_replication_sf()); connection slave; select * from t1 into outfile "../../tmp/t1_slave.txt"; -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead connection master; create temporary table t1_slave select * from t1 where 1=0; load data infile '../../tmp/t1_slave.txt' into table t1_slave; diff --git a/mysql-test/suite/engines/funcs/r/rpl_row_drop.result b/mysql-test/suite/engines/funcs/r/rpl_row_drop.result index 8753764e..8546960b 100644 --- a/mysql-test/suite/engines/funcs/r/rpl_row_drop.result +++ b/mysql-test/suite/engines/funcs/r/rpl_row_drop.result @@ -6,6 +6,7 @@ CREATE TABLE t2 (a int); CREATE TEMPORARY TABLE t2 (a int, b int); SHOW TABLES; Tables_in_test +t2 t1 t2 connection slave; @@ -28,6 +29,7 @@ connection master; CREATE TEMPORARY TABLE t2 (a int, b int); SHOW TABLES; Tables_in_test +t2 t1 t2 connection slave; diff --git a/mysql-test/suite/engines/funcs/r/rpl_sp,myisam,mix.rdiff b/mysql-test/suite/engines/funcs/r/rpl_sp,myisam,mix.rdiff index da41283e..cbf297f8 100644 --- a/mysql-test/suite/engines/funcs/r/rpl_sp,myisam,mix.rdiff +++ b/mysql-test/suite/engines/funcs/r/rpl_sp,myisam,mix.rdiff @@ -1,5 +1,5 @@ ---- /home/alice/git/10.3/mysql-test/suite/engines/funcs/r/rpl_sp,myisam,mix.result~ 2021-03-19 17:27:12.935559866 +0100 -+++ /home/alice/git/10.3/mysql-test/suite/engines/funcs/r/rpl_sp,myisam,mix.reject 2021-03-19 17:27:14.071534938 +0100 +--- /home/alice/git/10.3/mysql-test/suite/engines/funcs/r/rpl_sp,myisam,mix.result~ ++++ /home/alice/git/10.3/mysql-test/suite/engines/funcs/r/rpl_sp,myisam,mix.reject @@ -126,12 +126,15 @@ show warnings; Level Code Message diff --git a/mysql-test/suite/engines/funcs/r/rpl_temporary.result b/mysql-test/suite/engines/funcs/r/rpl_temporary.result index 492e9ac3..3651ead1 100644 --- a/mysql-test/suite/engines/funcs/r/rpl_temporary.result +++ b/mysql-test/suite/engines/funcs/r/rpl_temporary.result @@ -42,12 +42,12 @@ connect con3,localhost,zedjzlcsjhd,,; connection con3; SET @save_select_limit=@@session.sql_select_limit; SET @@session.sql_select_limit=10, @@session.pseudo_thread_id=100; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG REPLAY privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG REPLAY privilege(s) for this operation SELECT @@session.sql_select_limit = @save_select_limit; @@session.sql_select_limit = @save_select_limit 1 SET @@session.sql_select_limit=10, @@session.sql_log_bin=0; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation SELECT @@session.sql_select_limit = @save_select_limit; @@session.sql_select_limit = @save_select_limit 1 diff --git a/mysql-test/suite/engines/funcs/r/tc_temporary_column.result b/mysql-test/suite/engines/funcs/r/tc_temporary_column.result index 03627817..e2efd0d4 100644 --- a/mysql-test/suite/engines/funcs/r/tc_temporary_column.result +++ b/mysql-test/suite/engines/funcs/r/tc_temporary_column.result @@ -2,6 +2,7 @@ DROP TABLE IF EXISTS t1; CREATE TEMPORARY TABLE t1(c1 BIT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -13,6 +14,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 TINYINT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -24,6 +26,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 SMALLINT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -35,6 +38,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 MEDIUMINT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -46,6 +50,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 INT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -57,6 +62,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 INTEGER NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -68,6 +74,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 BIGINT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -79,6 +86,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 DECIMAL NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -90,6 +98,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 DEC NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -101,6 +110,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 FIXED NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -112,6 +122,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 NUMERIC NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -123,6 +134,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 DOUBLE NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -134,6 +146,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 REAL NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -145,6 +158,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 DOUBLE PRECISION NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -156,6 +170,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 FLOAT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -167,6 +182,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 DATE NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -178,6 +194,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 TIME NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -189,6 +206,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 TIMESTAMP NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -200,6 +218,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 DATETIME NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -211,6 +230,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 YEAR NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -222,6 +242,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 TINYBLOB NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -233,6 +254,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 BLOB NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -244,6 +266,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 MEDIUMBLOB NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -255,6 +278,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 LONGBLOB NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -266,6 +290,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 TINYTEXT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -277,6 +302,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 TEXT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -288,6 +314,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 MEDIUMTEXT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -299,6 +326,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 LONGTEXT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -310,6 +338,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 BIT NOT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -321,6 +350,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 TINYINT NOT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -332,6 +362,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 SMALLINT NOT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -343,6 +374,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 MEDIUMINT NOT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -354,6 +386,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 INT NOT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -365,6 +398,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 INTEGER NOT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -376,6 +410,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 BIGINT NOT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -387,6 +422,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 DECIMAL NOT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -398,6 +434,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 DEC NOT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -409,6 +446,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 FIXED NOT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -420,6 +458,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 NUMERIC NOT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -431,6 +470,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 DOUBLE NOT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -442,6 +482,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 REAL NOT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -453,6 +494,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 DOUBLE PRECISION NOT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -464,6 +506,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 FLOAT NOT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -475,6 +518,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 DATE NOT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -486,6 +530,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 TIME NOT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -497,6 +542,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 TIMESTAMP NOT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -508,6 +554,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 DATETIME NOT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -519,6 +566,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 YEAR NOT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -530,6 +578,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 TINYBLOB NOT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -541,6 +590,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 BLOB NOT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -552,6 +602,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 MEDIUMBLOB NOT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -563,6 +614,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 LONGBLOB NOT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -574,6 +626,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 TINYTEXT NOT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -585,6 +638,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 TEXT NOT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -596,6 +650,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 MEDIUMTEXT NOT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( @@ -607,6 +662,7 @@ Tables_in_test CREATE TEMPORARY TABLE t1(c1 LONGTEXT NOT NULL); SHOW TABLES; Tables_in_test +t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( diff --git a/mysql-test/suite/engines/funcs/r/tc_temporary_column_length.result b/mysql-test/suite/engines/funcs/r/tc_temporary_column_length.result index f1a9a775..659043d9 100644 --- a/mysql-test/suite/engines/funcs/r/tc_temporary_column_length.result +++ b/mysql-test/suite/engines/funcs/r/tc_temporary_column_length.result @@ -2,6 +2,7 @@ DROP TABLE IF EXISTS t5; CREATE TEMPORARY TABLE t5(c1 BIT(10) NULL); SHOW TABLES; Tables_in_test +t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TEMPORARY TABLE `t5` ( @@ -13,6 +14,7 @@ Tables_in_test CREATE TEMPORARY TABLE t5(c1 TINYINT(10) NULL); SHOW TABLES; Tables_in_test +t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TEMPORARY TABLE `t5` ( @@ -24,6 +26,7 @@ Tables_in_test CREATE TEMPORARY TABLE t5(c1 SMALLINT(10) NULL); SHOW TABLES; Tables_in_test +t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TEMPORARY TABLE `t5` ( @@ -35,6 +38,7 @@ Tables_in_test CREATE TEMPORARY TABLE t5(c1 MEDIUMINT(10) NULL); SHOW TABLES; Tables_in_test +t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TEMPORARY TABLE `t5` ( @@ -46,6 +50,7 @@ Tables_in_test CREATE TEMPORARY TABLE t5(c1 INT(10) NULL); SHOW TABLES; Tables_in_test +t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TEMPORARY TABLE `t5` ( @@ -57,6 +62,7 @@ Tables_in_test CREATE TEMPORARY TABLE t5(c1 INTEGER(10) NULL); SHOW TABLES; Tables_in_test +t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TEMPORARY TABLE `t5` ( @@ -68,6 +74,7 @@ Tables_in_test CREATE TEMPORARY TABLE t5(c1 BIGINT(10) NULL); SHOW TABLES; Tables_in_test +t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TEMPORARY TABLE `t5` ( @@ -79,6 +86,7 @@ Tables_in_test CREATE TEMPORARY TABLE t5(c1 CHAR(10) NULL); SHOW TABLES; Tables_in_test +t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TEMPORARY TABLE `t5` ( @@ -90,6 +98,7 @@ Tables_in_test CREATE TEMPORARY TABLE t5(c1 VARCHAR(10) NULL); SHOW TABLES; Tables_in_test +t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TEMPORARY TABLE `t5` ( @@ -101,6 +110,7 @@ Tables_in_test CREATE TEMPORARY TABLE t5(c1 BINARY(10) NULL); SHOW TABLES; Tables_in_test +t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TEMPORARY TABLE `t5` ( @@ -112,6 +122,7 @@ Tables_in_test CREATE TEMPORARY TABLE t5(c1 VARBINARY(10) NULL); SHOW TABLES; Tables_in_test +t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TEMPORARY TABLE `t5` ( @@ -123,6 +134,7 @@ Tables_in_test CREATE TEMPORARY TABLE t5(c1 BIT(10) NOT NULL); SHOW TABLES; Tables_in_test +t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TEMPORARY TABLE `t5` ( @@ -134,6 +146,7 @@ Tables_in_test CREATE TEMPORARY TABLE t5(c1 TINYINT(10) NOT NULL); SHOW TABLES; Tables_in_test +t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TEMPORARY TABLE `t5` ( @@ -145,6 +158,7 @@ Tables_in_test CREATE TEMPORARY TABLE t5(c1 SMALLINT(10) NOT NULL); SHOW TABLES; Tables_in_test +t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TEMPORARY TABLE `t5` ( @@ -156,6 +170,7 @@ Tables_in_test CREATE TEMPORARY TABLE t5(c1 MEDIUMINT(10) NOT NULL); SHOW TABLES; Tables_in_test +t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TEMPORARY TABLE `t5` ( @@ -167,6 +182,7 @@ Tables_in_test CREATE TEMPORARY TABLE t5(c1 INT(10) NOT NULL); SHOW TABLES; Tables_in_test +t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TEMPORARY TABLE `t5` ( @@ -178,6 +194,7 @@ Tables_in_test CREATE TEMPORARY TABLE t5(c1 INTEGER(10) NOT NULL); SHOW TABLES; Tables_in_test +t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TEMPORARY TABLE `t5` ( @@ -189,6 +206,7 @@ Tables_in_test CREATE TEMPORARY TABLE t5(c1 BIGINT(10) NOT NULL); SHOW TABLES; Tables_in_test +t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TEMPORARY TABLE `t5` ( @@ -200,6 +218,7 @@ Tables_in_test CREATE TEMPORARY TABLE t5(c1 CHAR(10) NOT NULL); SHOW TABLES; Tables_in_test +t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TEMPORARY TABLE `t5` ( @@ -211,6 +230,7 @@ Tables_in_test CREATE TEMPORARY TABLE t5(c1 VARCHAR(10) NOT NULL); SHOW TABLES; Tables_in_test +t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TEMPORARY TABLE `t5` ( @@ -222,6 +242,7 @@ Tables_in_test CREATE TEMPORARY TABLE t5(c1 BINARY(10) NOT NULL); SHOW TABLES; Tables_in_test +t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TEMPORARY TABLE `t5` ( @@ -233,6 +254,7 @@ Tables_in_test CREATE TEMPORARY TABLE t5(c1 VARBINARY(10) NOT NULL); SHOW TABLES; Tables_in_test +t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TEMPORARY TABLE `t5` ( diff --git a/mysql-test/suite/engines/funcs/t/rpl_dual_pos_advance.test b/mysql-test/suite/engines/funcs/t/rpl_dual_pos_advance.test index bf5e8415..a61904ed 100644 --- a/mysql-test/suite/engines/funcs/t/rpl_dual_pos_advance.test +++ b/mysql-test/suite/engines/funcs/t/rpl_dual_pos_advance.test @@ -16,7 +16,7 @@ reset master; connection master; --replace_result $SLAVE_MYPORT SLAVE_PORT -eval change master to master_host="127.0.0.1",master_port=$SLAVE_MYPORT,master_user="root"; +eval change master to master_host="127.0.0.1",master_port=$SLAVE_MYPORT,master_user="root",master_ssl_verify_server_cert=0; --source include/start_slave.inc @@ -100,6 +100,7 @@ reset slave; drop table t1,t4,t5,t6; # add t2 and t3 later --sync_slave_with_master +--source include/wait_for_slave_to_start.inc # End of 4.1 tests --source include/rpl_end.inc diff --git a/mysql-test/suite/engines/funcs/t/rpl_flushlog_loop.test b/mysql-test/suite/engines/funcs/t/rpl_flushlog_loop.test index b4742246..38da16ff 100644 --- a/mysql-test/suite/engines/funcs/t/rpl_flushlog_loop.test +++ b/mysql-test/suite/engines/funcs/t/rpl_flushlog_loop.test @@ -11,7 +11,7 @@ connection slave; --replace_result $MASTER_MYPORT MASTER_PORT eval change master to master_host='127.0.0.1',master_user='root', - master_password='',master_port=$MASTER_MYPORT; + master_password='',master_port=$MASTER_MYPORT, master_ssl_verify_server_cert=0; --source include/start_slave.inc # # Start replication slave -> master @@ -20,7 +20,7 @@ connection master; --replace_result $SLAVE_MYPORT SLAVE_PORT eval change master to master_host='127.0.0.1',master_user='root', - master_password='',master_port=$SLAVE_MYPORT; + master_password='',master_port=$SLAVE_MYPORT, master_ssl_verify_server_cert=0; --source include/start_slave.inc # |