diff options
Diffstat (limited to 'storage/tokudb/mysql-test/rpl')
21 files changed, 350 insertions, 162 deletions
diff --git a/storage/tokudb/mysql-test/rpl/disabled.def b/storage/tokudb/mysql-test/rpl/disabled.def index 4c1a9a3e785..282e343d57f 100644 --- a/storage/tokudb/mysql-test/rpl/disabled.def +++ b/storage/tokudb/mysql-test/rpl/disabled.def @@ -13,3 +13,4 @@ rpl_tokudb_write_unique_uc1: unreliable, uses timestamp differences rpl_tokudb_read_only_ff: unreliable, uses timestamp differences rpl_tokudb_read_only_tf: unreliable, uses timestamp differences rpl_tokudb_read_only_tt: unreliable, uses timestamp differences +rpl_tokudb_read_only_ft: no TOKU_INCLUDE_RFR diff --git a/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_master_tokudb.result b/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_master_tokudb.result index 6ee39039985..cca18c7c1ab 100644 --- a/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_master_tokudb.result +++ b/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_master_tokudb.result @@ -194,7 +194,7 @@ INSERT into t31 set f1=1, f2=1, f3=1, f4='first'; insert ignore into t31 set f1=1, f2=1, f3=2, f4='second', f9=2.2, f10='seven samurai', f28=222.222, f35='222'; Warnings: -Warning 1366 Incorrect integer value: 'seven samurai' for column 'f10' at row 1 +Warning 1366 Incorrect integer value: 'seven samurai' for column `test`.`t31`.`f10` at row 1 insert ignore into t31 values (1, 1, 3, 'third', /* f5 BIGINT, */ 333333333333333333333333, /* f6 BLOB, */ '3333333333333333333333', diff --git a/storage/tokudb/mysql-test/rpl/r/rpl_mixed_replace_into.result b/storage/tokudb/mysql-test/rpl/r/rpl_mixed_replace_into.result new file mode 100644 index 00000000000..abe80743f62 --- /dev/null +++ b/storage/tokudb/mysql-test/rpl/r/rpl_mixed_replace_into.result @@ -0,0 +1,23 @@ +include/master-slave.inc +[connection master] +set default_storage_engine='tokudb'; +drop table if exists testr; +CREATE TABLE testr (pk int(11) NOT NULL AUTO_INCREMENT, num int(11) DEFAULT NULL, txt varchar(32) DEFAULT NULL, PRIMARY KEY (pk) ); +INSERT INTO testr VALUES (1,1,'one'),(2,2,'two'),(3,3,'three'),(4,4,'four'); +replace into testr values (2,2,'twotwo'); +select * from testr; +pk num txt +1 1 one +2 2 twotwo +3 3 three +4 4 four +connection slave; +select * from testr; +pk num txt +1 1 one +2 2 twotwo +3 3 three +4 4 four +connection master; +drop table testr; +include/rpl_end.inc diff --git a/storage/tokudb/mysql-test/rpl/r/rpl_not_null_tokudb.result b/storage/tokudb/mysql-test/rpl/r/rpl_not_null_tokudb.result index 6f70d6165a1..66aaaa6b6fa 100644 --- a/storage/tokudb/mysql-test/rpl/r/rpl_not_null_tokudb.result +++ b/storage/tokudb/mysql-test/rpl/r/rpl_not_null_tokudb.result @@ -46,15 +46,7 @@ INSERT INTO t4(a) VALUES (5); connection slave; TABLES t1 and t2 must be equal otherwise an error will be thrown. include/diff_tables.inc [master:t1, slave:t1] -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 -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 include/diff_tables.inc [master:t2, slave:t2] -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 -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 TABLES t2 and t3 must be different. connection master; SELECT * FROM t3 ORDER BY a; @@ -95,10 +87,6 @@ REPLACE INTO t1(a,b,c) VALUES (2, NULL, 300); connection slave; TABLES t1 and t2 must be equal otherwise an error will be thrown. include/diff_tables.inc [master:t1, slave:t1] -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 -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 ************* CLEANING ************* connection master; DROP TABLE t1; @@ -151,10 +139,6 @@ REPLACE INTO t1(a,b,c) VALUES (2, NULL, b'00'); TABLES t1 and t2 must be equal otherwise an error will be thrown. connection slave; include/diff_tables.inc [master:t1, slave:t1] -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 -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; DROP TABLE t1; connection slave; diff --git a/storage/tokudb/mysql-test/rpl/r/rpl_parallel_tokudb_delete_pk.result b/storage/tokudb/mysql-test/rpl/r/rpl_parallel_tokudb_delete_pk.result index 28f1a384236..9ad7708a11d 100644 --- a/storage/tokudb/mysql-test/rpl/r/rpl_parallel_tokudb_delete_pk.result +++ b/storage/tokudb/mysql-test/rpl/r/rpl_parallel_tokudb_delete_pk.result @@ -5,11 +5,6 @@ drop table if exists t; connection slave; show variables like 'tokudb_rpl_%'; Variable_name Value -tokudb_rpl_check_readonly ON -tokudb_rpl_lookup_rows OFF -tokudb_rpl_lookup_rows_delay 10000 -tokudb_rpl_unique_checks OFF -tokudb_rpl_unique_checks_delay 10000 connection master; create table t (a bigint not null, primary key(a)) engine=tokudb; insert into t values (1); @@ -19,10 +14,6 @@ connection master; connection slave; connection master; include/diff_tables.inc [master:test.t, slave:test.t] -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 -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; delete from t where a=2; select unix_timestamp() into @tstart; @@ -34,10 +25,6 @@ select @tend-@tstart <= 5; @tend-@tstart <= 5 1 include/diff_tables.inc [master:test.t, slave:test.t] -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 -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; drop table if exists t; connection slave; diff --git a/storage/tokudb/mysql-test/rpl/r/rpl_parallel_tokudb_update_pk_uc0_lookup0.result b/storage/tokudb/mysql-test/rpl/r/rpl_parallel_tokudb_update_pk_uc0_lookup0.result index 7e250dee4b4..10ab579de27 100644 --- a/storage/tokudb/mysql-test/rpl/r/rpl_parallel_tokudb_update_pk_uc0_lookup0.result +++ b/storage/tokudb/mysql-test/rpl/r/rpl_parallel_tokudb_update_pk_uc0_lookup0.result @@ -5,11 +5,6 @@ drop table if exists t; connection slave; show variables like 'tokudb_rpl_%'; Variable_name Value -tokudb_rpl_check_readonly ON -tokudb_rpl_lookup_rows OFF -tokudb_rpl_lookup_rows_delay 10000 -tokudb_rpl_unique_checks OFF -tokudb_rpl_unique_checks_delay 10000 connection master; create table t (a bigint not null, b bigint not null, primary key(a)) engine=tokudb; insert into t values (1,0); @@ -19,10 +14,6 @@ connection master; connection slave; connection master; include/diff_tables.inc [master:test.t, slave:test.t] -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 -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; update t set b=b+1 where a=2; update t set b=b+2 where a=1; @@ -44,10 +35,6 @@ a b 3 5 4 3 include/diff_tables.inc [master:test.t, slave:test.t] -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 -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; drop table if exists t; connection slave; diff --git a/storage/tokudb/mysql-test/rpl/r/rpl_parallel_tokudb_write_pk.result b/storage/tokudb/mysql-test/rpl/r/rpl_parallel_tokudb_write_pk.result index 6388fad22b2..0ae63f0d02f 100644 --- a/storage/tokudb/mysql-test/rpl/r/rpl_parallel_tokudb_write_pk.result +++ b/storage/tokudb/mysql-test/rpl/r/rpl_parallel_tokudb_write_pk.result @@ -5,8 +5,6 @@ drop table if exists t; connection slave; show variables like 'tokudb_rpl_unique_checks%'; Variable_name Value -tokudb_rpl_unique_checks OFF -tokudb_rpl_unique_checks_delay 5000 connection master; create table t (a bigint not null, primary key(a)) engine=tokudb; insert into t values (1); @@ -17,10 +15,6 @@ connection master; connection slave; connection master; include/diff_tables.inc [master:test.t, slave:test.t] -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 -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; drop table if exists t; connection slave; diff --git a/storage/tokudb/mysql-test/rpl/r/rpl_row_basic_3tokudb.result b/storage/tokudb/mysql-test/rpl/r/rpl_row_basic_3tokudb.result index 1edcc5c410e..32a42143180 100644 --- a/storage/tokudb/mysql-test/rpl/r/rpl_row_basic_3tokudb.result +++ b/storage/tokudb/mysql-test/rpl/r/rpl_row_basic_3tokudb.result @@ -540,20 +540,12 @@ INSERT INTO t1 VALUES (1, "", 1); INSERT INTO t1 VALUES (2, repeat(_utf8'a', 16), 2); connection slave; include/diff_tables.inc [master:t1, slave:t1] -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 -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 [expecting slave to replicate correctly] connection master; INSERT INTO t2 VALUES (1, "", 1); INSERT INTO t2 VALUES (2, repeat(_utf8'a', 16), 2); connection slave; include/diff_tables.inc [master:t2, slave:t2] -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 -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 slave; SET GLOBAL SLAVE_TYPE_CONVERSIONS = @saved_slave_type_conversions; call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 1 size mismatch.* error.* 1535"); @@ -567,10 +559,6 @@ INSERT INTO t4 VALUES (1, "", 1); INSERT INTO t4 VALUES (2, repeat(_utf8'a', 128), 2); connection slave; include/diff_tables.inc [master:t4, slave:t4] -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 -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 [expecting slave to stop] connection master; INSERT INTO t5 VALUES (1, "", 1); @@ -593,10 +581,6 @@ INSERT INTO t7 VALUES (1, "", 1); INSERT INTO t7 VALUES (2, repeat(_utf8'a', 255), 2); connection slave; include/diff_tables.inc [master:t7, slave:t7] -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 -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; drop table t1, t2, t3, t4, t5, t6, t7; connection slave; @@ -608,10 +592,6 @@ ERROR 23000: Duplicate entry '10' for key 'PRIMARY' INSERT INTO t1 VALUES (4); connection slave; include/diff_tables.inc [master:t1, slave:t1] -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 -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; drop table t1; connection slave; @@ -670,10 +650,6 @@ UPDATE t1 SET `int_key` = 4 ORDER BY `pk` LIMIT 6; connection slave; *** results: t2 must be consistent **** include/diff_tables.inc [master:t2, slave:t2] -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 -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; DROP TABLE t1, t2; EOF OF TESTS @@ -693,10 +669,6 @@ UPDATE t1 SET a = 0 WHERE a < 4; UPDATE t1 SET a = 8 WHERE a < 5; connection slave; include/diff_tables.inc [master:t1, slave:t1] -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 -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; drop table t1; connection slave; @@ -748,10 +720,6 @@ UPDATE IGNORE t1 SET a = 9 WHERE a < 5 LIMIT 3; connection slave; SET GLOBAL SLAVE_TYPE_CONVERSIONS = @saved_slave_type_conversions; include/diff_tables.inc [master:t1, slave:t1] -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 -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; drop table t1; connection slave; diff --git a/storage/tokudb/mysql-test/rpl/r/rpl_row_rec_comp_tokudb.result b/storage/tokudb/mysql-test/rpl/r/rpl_row_rec_comp_tokudb.result index e58e1ddad9f..df1fe125aa4 100644 --- a/storage/tokudb/mysql-test/rpl/r/rpl_row_rec_comp_tokudb.result +++ b/storage/tokudb/mysql-test/rpl/r/rpl_row_rec_comp_tokudb.result @@ -9,10 +9,6 @@ INSERT INTO t1 ( c5, c6 ) VALUES ( NULL, 35 ); UPDATE IGNORE t1 SET c5 = 'a'; connection slave; include/diff_tables.inc [master:t1, slave:t1] -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 -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; DROP TABLE t1; connection slave; @@ -26,10 +22,6 @@ INSERT INTO t1 ( c5, c6 ) VALUES ( NULL, 35 ); UPDATE IGNORE t1 SET c5 = 'a'; connection slave; include/diff_tables.inc [master:t1, slave:t1] -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 -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; DROP TABLE t1; connection slave; @@ -42,10 +34,6 @@ INSERT INTO t1(c1) VALUES (NULL); UPDATE t1 SET c1= 0; connection slave; include/diff_tables.inc [master:t1, slave:t1] -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 -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; DROP TABLE t1; connection slave; diff --git a/storage/tokudb/mysql-test/rpl/r/rpl_row_replace_into.result b/storage/tokudb/mysql-test/rpl/r/rpl_row_replace_into.result new file mode 100644 index 00000000000..abe80743f62 --- /dev/null +++ b/storage/tokudb/mysql-test/rpl/r/rpl_row_replace_into.result @@ -0,0 +1,23 @@ +include/master-slave.inc +[connection master] +set default_storage_engine='tokudb'; +drop table if exists testr; +CREATE TABLE testr (pk int(11) NOT NULL AUTO_INCREMENT, num int(11) DEFAULT NULL, txt varchar(32) DEFAULT NULL, PRIMARY KEY (pk) ); +INSERT INTO testr VALUES (1,1,'one'),(2,2,'two'),(3,3,'three'),(4,4,'four'); +replace into testr values (2,2,'twotwo'); +select * from testr; +pk num txt +1 1 one +2 2 twotwo +3 3 three +4 4 four +connection slave; +select * from testr; +pk num txt +1 1 one +2 2 twotwo +3 3 three +4 4 four +connection master; +drop table testr; +include/rpl_end.inc diff --git a/storage/tokudb/mysql-test/rpl/r/rpl_set_null_tokudb.result b/storage/tokudb/mysql-test/rpl/r/rpl_set_null_tokudb.result index 7088e96aed9..19ca9b2c59e 100644 --- a/storage/tokudb/mysql-test/rpl/r/rpl_set_null_tokudb.result +++ b/storage/tokudb/mysql-test/rpl/r/rpl_set_null_tokudb.result @@ -7,18 +7,10 @@ INSERT INTO `t1` VALUES ( 1, 1 ); UPDATE t1 SET c1=NULL where c2=1; connection slave; include/diff_tables.inc [master:t1, slave:t1] -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 -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; DELETE FROM t1 WHERE c2=1 LIMIT 1; connection slave; include/diff_tables.inc [master:t1, slave:t1] -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 -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; DROP TABLE t1; connection slave; @@ -32,18 +24,10 @@ w UPDATE t1 SET c1=NULL WHERE c1='w'; connection slave; include/diff_tables.inc [master:t1, slave:t1] -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 -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; DELETE FROM t1 LIMIT 2; connection slave; include/diff_tables.inc [master:t1, slave:t1] -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 -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; DROP TABLE t1; connection slave; diff --git a/storage/tokudb/mysql-test/rpl/r/rpl_stmt_replace_into.result b/storage/tokudb/mysql-test/rpl/r/rpl_stmt_replace_into.result new file mode 100644 index 00000000000..abe80743f62 --- /dev/null +++ b/storage/tokudb/mysql-test/rpl/r/rpl_stmt_replace_into.result @@ -0,0 +1,23 @@ +include/master-slave.inc +[connection master] +set default_storage_engine='tokudb'; +drop table if exists testr; +CREATE TABLE testr (pk int(11) NOT NULL AUTO_INCREMENT, num int(11) DEFAULT NULL, txt varchar(32) DEFAULT NULL, PRIMARY KEY (pk) ); +INSERT INTO testr VALUES (1,1,'one'),(2,2,'two'),(3,3,'three'),(4,4,'four'); +replace into testr values (2,2,'twotwo'); +select * from testr; +pk num txt +1 1 one +2 2 twotwo +3 3 three +4 4 four +connection slave; +select * from testr; +pk num txt +1 1 one +2 2 twotwo +3 3 three +4 4 four +connection master; +drop table testr; +include/rpl_end.inc diff --git a/storage/tokudb/mysql-test/rpl/r/rpl_tokudb_mixed_dml.result b/storage/tokudb/mysql-test/rpl/r/rpl_tokudb_mixed_dml.result index a5060d9e3bf..df3ea1d6de6 100644 --- a/storage/tokudb/mysql-test/rpl/r/rpl_tokudb_mixed_dml.result +++ b/storage/tokudb/mysql-test/rpl/r/rpl_tokudb_mixed_dml.result @@ -484,77 +484,78 @@ SET TRANSACTION ISOLATION LEVEL SERIALIZABLE; ******************** CREATE USER ******************** CREATE USER 'user_test_rpl'@'localhost' IDENTIFIED BY PASSWORD '*1111111111111111111111111111111111111111'; SELECT host, user, password, plugin, authentication_string, select_priv FROM mysql.user WHERE user LIKE 'user_test_rpl%'; -host user password plugin authentication_string select_priv -localhost user_test_rpl *1111111111111111111111111111111111111111 N +Host User Password plugin authentication_string Select_priv +localhost user_test_rpl *1111111111111111111111111111111111111111 mysql_native_password *1111111111111111111111111111111111111111 N connection slave; USE test_rpl; SELECT host, user, password, plugin, authentication_string, select_priv FROM mysql.user WHERE user LIKE 'user_test_rpl%'; -host user password plugin authentication_string select_priv -localhost user_test_rpl *1111111111111111111111111111111111111111 N +Host User Password plugin authentication_string Select_priv +localhost user_test_rpl *1111111111111111111111111111111111111111 mysql_native_password *1111111111111111111111111111111111111111 N connection master; ******************** GRANT ******************** GRANT SELECT ON *.* TO 'user_test_rpl'@'localhost'; SELECT host, user, password, plugin, authentication_string, select_priv FROM mysql.user WHERE user LIKE 'user_test_rpl%'; -host user password plugin authentication_string select_priv -localhost user_test_rpl *1111111111111111111111111111111111111111 Y +Host User Password plugin authentication_string Select_priv +localhost user_test_rpl *1111111111111111111111111111111111111111 mysql_native_password *1111111111111111111111111111111111111111 Y connection slave; USE test_rpl; SELECT host, user, password, plugin, authentication_string, select_priv FROM mysql.user WHERE user LIKE 'user_test_rpl%'; -host user password plugin authentication_string select_priv -localhost user_test_rpl *1111111111111111111111111111111111111111 Y +Host User Password plugin authentication_string Select_priv +localhost user_test_rpl *1111111111111111111111111111111111111111 mysql_native_password *1111111111111111111111111111111111111111 Y connection master; ******************** REVOKE ******************** REVOKE SELECT ON *.* FROM 'user_test_rpl'@'localhost'; SELECT host, user, password, plugin, authentication_string, select_priv FROM mysql.user WHERE user LIKE 'user_test_rpl%'; -host user password plugin authentication_string select_priv -localhost user_test_rpl *1111111111111111111111111111111111111111 N +Host User Password plugin authentication_string Select_priv +localhost user_test_rpl *1111111111111111111111111111111111111111 mysql_native_password *1111111111111111111111111111111111111111 N connection slave; USE test_rpl; SELECT host, user, password, plugin, authentication_string, select_priv FROM mysql.user WHERE user LIKE 'user_test_rpl%'; -host user password plugin authentication_string select_priv -localhost user_test_rpl *1111111111111111111111111111111111111111 N +Host User Password plugin authentication_string Select_priv +localhost user_test_rpl *1111111111111111111111111111111111111111 mysql_native_password *1111111111111111111111111111111111111111 N connection master; ******************** SET PASSWORD ******************** SET PASSWORD FOR 'user_test_rpl'@'localhost' = '*0000000000000000000000000000000000000000'; SELECT host, user, password, plugin, authentication_string, select_priv FROM mysql.user WHERE user LIKE 'user_test_rpl%'; -host user password plugin authentication_string select_priv -localhost user_test_rpl mysql_native_password *0000000000000000000000000000000000000000 N +Host User Password plugin authentication_string Select_priv +localhost user_test_rpl *0000000000000000000000000000000000000000 mysql_native_password *0000000000000000000000000000000000000000 N connection slave; USE test_rpl; SELECT host, user, password, plugin, authentication_string, select_priv FROM mysql.user WHERE user LIKE 'user_test_rpl%'; -host user password plugin authentication_string select_priv -localhost user_test_rpl mysql_native_password *0000000000000000000000000000000000000000 N +Host User Password plugin authentication_string Select_priv +localhost user_test_rpl *0000000000000000000000000000000000000000 mysql_native_password *0000000000000000000000000000000000000000 N connection master; ******************** RENAME USER ******************** RENAME USER 'user_test_rpl'@'localhost' TO 'user_test_rpl_2'@'localhost'; SELECT host, user, password, plugin, authentication_string, select_priv FROM mysql.user WHERE user LIKE 'user_test_rpl%'; -host user password plugin authentication_string select_priv -localhost user_test_rpl_2 mysql_native_password *0000000000000000000000000000000000000000 N +Host User Password plugin authentication_string Select_priv +localhost user_test_rpl_2 *0000000000000000000000000000000000000000 mysql_native_password *0000000000000000000000000000000000000000 N connection slave; USE test_rpl; SELECT host, user, password, plugin, authentication_string, select_priv FROM mysql.user WHERE user LIKE 'user_test_rpl%'; -host user password plugin authentication_string select_priv -localhost user_test_rpl_2 mysql_native_password *0000000000000000000000000000000000000000 N +Host User Password plugin authentication_string Select_priv +localhost user_test_rpl_2 *0000000000000000000000000000000000000000 mysql_native_password *0000000000000000000000000000000000000000 N connection master; ******************** DROP USER ******************** DROP USER 'user_test_rpl_2'@'localhost'; SELECT host, user, password, plugin, authentication_string, select_priv FROM mysql.user WHERE user LIKE 'user_test_rpl%'; -host user password plugin authentication_string select_priv +Host User Password plugin authentication_string Select_priv connection slave; USE test_rpl; SELECT host, user, password, plugin, authentication_string, select_priv FROM mysql.user WHERE user LIKE 'user_test_rpl%'; -host user password plugin authentication_string select_priv +Host User Password plugin authentication_string Select_priv connection master; INSERT INTO t1 VALUES(100, 'test'); ******************** ANALYZE ******************** ANALYZE TABLE t1; Table Op Msg_type Msg_text +test_rpl.t1 analyze status Engine-independent statistics collected test_rpl.t1 analyze status OK ******************** CHECK TABLE ******************** @@ -679,7 +680,6 @@ DROP TRIGGER tr1; ******************** EVENTS ******************** -GRANT EVENT ON *.* TO 'root'@'localhost'; INSERT INTO t1 VALUES(1, 'test1'); CREATE EVENT e1 ON SCHEDULE EVERY '1' SECOND COMMENT 'e_second_comment' DO DELETE FROM t1; SHOW EVENTS; @@ -1101,8 +1101,6 @@ master-bin.000001 # Query # # use `test_rpl`; DELETE FROM t2 master-bin.000001 # Xid # # COMMIT /* XID */ master-bin.000001 # Gtid # # GTID #-#-# master-bin.000001 # Query # # use `test_rpl`; DROP TRIGGER tr1 -master-bin.000001 # Gtid # # GTID #-#-# -master-bin.000001 # Query # # use `test_rpl`; GRANT EVENT ON *.* TO 'root'@'localhost' master-bin.000001 # Gtid # # BEGIN GTID #-#-# master-bin.000001 # Query # # use `test_rpl`; INSERT INTO t1 VALUES(1, 'test1') master-bin.000001 # Xid # # COMMIT /* XID */ diff --git a/storage/tokudb/mysql-test/rpl/r/rpl_truncate_3tokudb.result b/storage/tokudb/mysql-test/rpl/r/rpl_truncate_3tokudb.result index 478fbcc68df..5d3737817a1 100644 --- a/storage/tokudb/mysql-test/rpl/r/rpl_truncate_3tokudb.result +++ b/storage/tokudb/mysql-test/rpl/r/rpl_truncate_3tokudb.result @@ -9,10 +9,6 @@ connection master; TRUNCATE TABLE t1; connection slave; include/diff_tables.inc [master:t1, slave:t1] -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 -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 ==== Test using a table with delete triggers ==== connection master; SET @count := 1; @@ -23,10 +19,6 @@ connection master; TRUNCATE TABLE t1; connection slave; include/diff_tables.inc [master:t2, slave:t2] -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 -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; DROP TABLE t1,t2; connection slave; @@ -39,10 +31,6 @@ connection master; DELETE FROM t1; connection slave; include/diff_tables.inc [master:t1, slave:t1] -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 -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 ==== Test using a table with delete triggers ==== connection master; SET @count := 1; @@ -53,10 +41,6 @@ connection master; DELETE FROM t1; connection slave; include/diff_tables.inc [master:t2, slave:t2] -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 -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; DROP TABLE t1,t2; connection slave; diff --git a/storage/tokudb/mysql-test/rpl/r/rpl_typeconv_tokudb.result b/storage/tokudb/mysql-test/rpl/r/rpl_typeconv_tokudb.result index 27a89c3b67c..636792ce4db 100644 --- a/storage/tokudb/mysql-test/rpl/r/rpl_typeconv_tokudb.result +++ b/storage/tokudb/mysql-test/rpl/r/rpl_typeconv_tokudb.result @@ -8,10 +8,6 @@ CREATE TABLE t1(b1 BIT(1), b2 BIT(2), b3 BIT(3)) ENGINE=TokuDB; INSERT INTO t1 VALUES (b'0', b'01', b'101'); connection slave; include/diff_tables.inc [master:t1, slave:t1] -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 -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; DROP TABLE t1; connection slave; diff --git a/storage/tokudb/mysql-test/rpl/r/rpl_xa_interleave.result b/storage/tokudb/mysql-test/rpl/r/rpl_xa_interleave.result new file mode 100644 index 00000000000..98ded9d2097 --- /dev/null +++ b/storage/tokudb/mysql-test/rpl/r/rpl_xa_interleave.result @@ -0,0 +1,78 @@ +include/master-slave.inc +[connection master] +CREATE TABLE t1(`a` INT) ENGINE=TokuDB; +connection master; +XA START 'x1'; +INSERT INTO t1 VALUES (1); +XA END 'x1'; +XA PREPARE 'x1'; +connection master1; +BEGIN; +INSERT INTO t1 VALUES (10); +COMMIT; +XA START 'y1'; +INSERT INTO t1 VALUES (2); +XA END 'y1'; +XA PREPARE 'y1'; +connection master; +XA COMMIT 'x1'; +connection master1; +XA COMMIT 'y1'; +connection master; +BEGIN; +INSERT INTO t1 VALUES (11); +COMMIT; +XA START 'x2'; +INSERT INTO t1 VALUES (3); +XA END 'x2'; +XA PREPARE 'x2'; +connection master1; +XA START 'y2'; +INSERT INTO t1 VALUES (4); +XA END 'y2'; +XA PREPARE 'y2'; +connection master; +XA COMMIT 'x2'; +connection master1; +XA COMMIT 'y2'; +connection master; +XA START 'x1'; +INSERT INTO t1 VALUES (1); +XA END 'x1'; +XA PREPARE 'x1'; +connection master1; +BEGIN; +INSERT INTO t1 VALUES (10); +COMMIT; +XA START 'y1'; +INSERT INTO t1 VALUES (2); +XA END 'y1'; +XA PREPARE 'y1'; +connection master; +XA ROLLBACK 'x1'; +connection master1; +XA ROLLBACK 'y1'; +connection master; +BEGIN; +INSERT INTO t1 VALUES (11); +COMMIT; +XA START 'x2'; +INSERT INTO t1 VALUES (3); +XA END 'x2'; +XA PREPARE 'x2'; +connection master1; +XA START 'y2'; +INSERT INTO t1 VALUES (4); +XA END 'y2'; +XA PREPARE 'y2'; +connection master; +XA ROLLBACK 'x2'; +connection master1; +XA ROLLBACK 'y2'; +connection master; +connection slave; +TABLES t1 and t2 must be equal otherwise an error will be thrown. +include/diff_tables.inc [master:test.t1, slave:test.t1] +connection master; +DROP TABLE t1; +include/rpl_end.inc diff --git a/storage/tokudb/mysql-test/rpl/r/tokudb_innodb_xa_crash.result b/storage/tokudb/mysql-test/rpl/r/tokudb_innodb_xa_crash.result index ada27299b38..aa95091b40b 100644 --- a/storage/tokudb/mysql-test/rpl/r/tokudb_innodb_xa_crash.result +++ b/storage/tokudb/mysql-test/rpl/r/tokudb_innodb_xa_crash.result @@ -10,15 +10,7 @@ commit; connection slave; TABLES t1 and t2 must be equal otherwise an error will be thrown. include/diff_tables.inc [master:test.t1, slave:test.t1] -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 -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 include/diff_tables.inc [master:test.t2, slave:test.t2] -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 -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; drop table t1,t2; include/rpl_end.inc diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_mixed_replace_into.test b/storage/tokudb/mysql-test/rpl/t/rpl_mixed_replace_into.test new file mode 100644 index 00000000000..05e6e2fb228 --- /dev/null +++ b/storage/tokudb/mysql-test/rpl/t/rpl_mixed_replace_into.test @@ -0,0 +1,25 @@ +source include/have_tokudb.inc; +source include/master-slave.inc; +source include/have_binlog_format_mixed.inc; + +set default_storage_engine='tokudb'; + +disable_warnings; +drop table if exists testr; +enable_warnings; + +CREATE TABLE testr (pk int(11) NOT NULL AUTO_INCREMENT, num int(11) DEFAULT NULL, txt varchar(32) DEFAULT NULL, PRIMARY KEY (pk) ); +INSERT INTO testr VALUES (1,1,'one'),(2,2,'two'),(3,3,'three'),(4,4,'four'); +replace into testr values (2,2,'twotwo'); +select * from testr; + +save_master_pos; +connection slave; +sync_with_master; +select * from testr; + +connection master; + +drop table testr; + +source include/rpl_end.inc; diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_row_replace_into.test b/storage/tokudb/mysql-test/rpl/t/rpl_row_replace_into.test new file mode 100644 index 00000000000..062f11e0ed9 --- /dev/null +++ b/storage/tokudb/mysql-test/rpl/t/rpl_row_replace_into.test @@ -0,0 +1,25 @@ +source include/have_tokudb.inc; +source include/master-slave.inc; +source include/have_binlog_format_row.inc; + +set default_storage_engine='tokudb'; + +disable_warnings; +drop table if exists testr; +enable_warnings; + +CREATE TABLE testr (pk int(11) NOT NULL AUTO_INCREMENT, num int(11) DEFAULT NULL, txt varchar(32) DEFAULT NULL, PRIMARY KEY (pk) ); +INSERT INTO testr VALUES (1,1,'one'),(2,2,'two'),(3,3,'three'),(4,4,'four'); +replace into testr values (2,2,'twotwo'); +select * from testr; + +save_master_pos; +connection slave; +sync_with_master; +select * from testr; + +connection master; + +drop table testr; + +source include/rpl_end.inc; diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_stmt_replace_into.test b/storage/tokudb/mysql-test/rpl/t/rpl_stmt_replace_into.test new file mode 100644 index 00000000000..f7e4c7a09e0 --- /dev/null +++ b/storage/tokudb/mysql-test/rpl/t/rpl_stmt_replace_into.test @@ -0,0 +1,25 @@ +source include/have_tokudb.inc; +source include/master-slave.inc; +source include/have_binlog_format_statement.inc; + +set default_storage_engine='tokudb'; + +disable_warnings; +drop table if exists testr; +enable_warnings; + +CREATE TABLE testr (pk int(11) NOT NULL AUTO_INCREMENT, num int(11) DEFAULT NULL, txt varchar(32) DEFAULT NULL, PRIMARY KEY (pk) ); +INSERT INTO testr VALUES (1,1,'one'),(2,2,'two'),(3,3,'three'),(4,4,'four'); +replace into testr values (2,2,'twotwo'); +select * from testr; + +save_master_pos; +connection slave; +sync_with_master; +select * from testr; + +connection master; + +drop table testr; + +source include/rpl_end.inc; diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_xa_interleave.test b/storage/tokudb/mysql-test/rpl/t/rpl_xa_interleave.test new file mode 100644 index 00000000000..3941604c855 --- /dev/null +++ b/storage/tokudb/mysql-test/rpl/t/rpl_xa_interleave.test @@ -0,0 +1,103 @@ +--source include/have_tokudb.inc +--source include/have_binlog_format_mixed_or_row.inc +--source include/master-slave.inc + +CREATE TABLE t1(`a` INT) ENGINE=TokuDB; + +## XA interleave commit +--connection master +XA START 'x1'; +INSERT INTO t1 VALUES (1); +XA END 'x1'; +XA PREPARE 'x1'; + +--connection master1 +BEGIN; +INSERT INTO t1 VALUES (10); +COMMIT; +XA START 'y1'; +INSERT INTO t1 VALUES (2); +XA END 'y1'; +XA PREPARE 'y1'; + +--connection master +XA COMMIT 'x1'; + +--connection master1 +XA COMMIT 'y1'; + +--connection master +BEGIN; +INSERT INTO t1 VALUES (11); +COMMIT; +XA START 'x2'; +INSERT INTO t1 VALUES (3); +XA END 'x2'; +XA PREPARE 'x2'; + +--connection master1 +XA START 'y2'; +INSERT INTO t1 VALUES (4); +XA END 'y2'; +XA PREPARE 'y2'; + +--connection master +XA COMMIT 'x2'; + +--connection master1 +XA COMMIT 'y2'; + +## XA interleave rollback +--connection master +XA START 'x1'; +INSERT INTO t1 VALUES (1); +XA END 'x1'; +XA PREPARE 'x1'; + +--connection master1 +BEGIN; +INSERT INTO t1 VALUES (10); +COMMIT; +XA START 'y1'; +INSERT INTO t1 VALUES (2); +XA END 'y1'; +XA PREPARE 'y1'; + +--connection master +XA ROLLBACK 'x1'; + +--connection master1 +XA ROLLBACK 'y1'; + +--connection master +BEGIN; +INSERT INTO t1 VALUES (11); +COMMIT; +XA START 'x2'; +INSERT INTO t1 VALUES (3); +XA END 'x2'; +XA PREPARE 'x2'; + +--connection master1 +XA START 'y2'; +INSERT INTO t1 VALUES (4); +XA END 'y2'; +XA PREPARE 'y2'; + +--connection master +XA ROLLBACK 'x2'; + +--connection master1 +XA ROLLBACK 'y2'; + +--connection master + +--sync_slave_with_master + +--echo TABLES t1 and t2 must be equal otherwise an error will be thrown. +--let $diff_tables= master:test.t1, slave:test.t1 +--source include/diff_tables.inc + +--connection master +DROP TABLE t1; +--source include/rpl_end.inc |