diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-17 16:23:44 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-17 16:23:44 +0200 |
commit | 182faa3c06dd54e0364e6f43b4d5d938f94c1743 (patch) | |
tree | 1c67a16f1176c53811dae37221221e1ded02313e /mysql-test/suite/engines/funcs/r/rpl_row_inexist_tbl.result | |
parent | eb7c5530eccb7d6782077e5562f5a471d2ccbc01 (diff) | |
parent | f92e32bb52e4010194ca6be5b33de045561ec70e (diff) | |
download | mariadb-git-182faa3c06dd54e0364e6f43b4d5d938f94c1743.tar.gz |
Merge 10.2 into 10.3bb-10.3-MDEV-25121
Diffstat (limited to 'mysql-test/suite/engines/funcs/r/rpl_row_inexist_tbl.result')
-rw-r--r-- | mysql-test/suite/engines/funcs/r/rpl_row_inexist_tbl.result | 60 |
1 files changed, 13 insertions, 47 deletions
diff --git a/mysql-test/suite/engines/funcs/r/rpl_row_inexist_tbl.result b/mysql-test/suite/engines/funcs/r/rpl_row_inexist_tbl.result index aff54e01b95..e2bd199ecab 100644 --- a/mysql-test/suite/engines/funcs/r/rpl_row_inexist_tbl.result +++ b/mysql-test/suite/engines/funcs/r/rpl_row_inexist_tbl.result @@ -1,14 +1,12 @@ -stop slave; -drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; -reset master; -reset slave; -drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; -start slave; +include/master-slave.inc +[connection master] +connection master; create table t1 (a int not null primary key); insert into t1 values (1); create table t2 (a int); insert into t2 values (1); update t1, t2 set t1.a = 0 where t1.a = t2.a; +connection slave; show tables; Tables_in_test t1 @@ -16,46 +14,14 @@ select * from t1; a 0 drop table t1; +connection master; insert into t1 values (1); -show slave status; -Slave_IO_State # -Master_Host 127.0.0.1 -Master_User root -Master_Port MASTER_MYPORT -Connect_Retry 1 -Master_Log_File master-bin.000001 -Read_Master_Log_Pos # -Relay_Log_File # -Relay_Log_Pos # -Relay_Master_Log_File master-bin.000001 -Slave_IO_Running Yes -Slave_SQL_Running No -Replicate_Do_DB -Replicate_Ignore_DB -Replicate_Do_Table -Replicate_Ignore_Table test.t2 -Replicate_Wild_Do_Table -Replicate_Wild_Ignore_Table -Last_Errno 1146 -Last_Error Error executing row event: 'Table 'test.t1' doesn't exist' -Skip_Counter 0 -Exec_Master_Log_Pos # -Relay_Log_Space # -Until_Condition None -Until_Log_File -Until_Log_Pos 0 -Master_SSL_Allowed No -Master_SSL_CA_File -Master_SSL_CA_Path -Master_SSL_Cert -Master_SSL_Cipher -Master_SSL_Key -Seconds_Behind_Master # -Master_SSL_Verify_Server_Cert No -Last_IO_Errno 0 -Last_IO_Error -Last_SQL_Errno 1146 -Last_SQL_Error Error executing row event: 'Table 'test.t1' doesn't exist' -Replicate_Ignore_Server_Ids -Master_Server_Id 1 +connection slave; +call mtr.add_suppression("Slave SQL.*Error executing row event: .Table .test.t1. doesn.t exist., error.* 1146"); +include/wait_for_slave_sql_error.inc [errno=1146] +==== Clean up ==== +include/stop_slave_io.inc +RESET SLAVE; +connection master; drop table t1, t2; +include/rpl_end.inc |