mirror of
https://github.com/MariaDB/server.git
synced 2025-06-03 07:02:23 +03:00
2eecc377a6
merged manually by guilhem. client/mysqlbinlog.cc: Post-merge fixes; manually merged by guilhem. include/mysqld_error.h: Post-merge fixes. mysql-test/r/drop_temp_table.result: Post-merge fixes. mysql-test/r/insert.result: Post-merge fixes. mysql-test/r/mysqlbinlog.result: Post-merge fixes. mysql-test/r/query_cache.result: Post-merge fixes. mysql-test/r/rpl_error_ignored_table.result: Post-merge fixes. mysql-test/r/rpl_relayrotate.result: Post-merge fixes. mysql-test/r/rpl_trunc_binlog.result: Post-merge fixes. mysql-test/r/sp-error.result: Post-merge fixes. mysql-test/r/sp.result: Post-merge fixes. mysql-test/r/system_mysql_db.result: Post-merge fixes. mysql-test/r/variables.result: Post-merge fixes. mysql-test/t/rpl_error_ignored_table.test: Post-merge fixes. mysql-test/t/sp-error.test: Post-merge fixes. sql/ha_innodb.cc: Post-merge fixes. sql/log_event.cc: Post-merge fixes; manually merged by guilhem. sql/set_var.cc: Post-merge fixes. sql/share/danish/errmsg.txt: Post-merge fixes. sql/share/dutch/errmsg.txt: Post-merge fixes. sql/share/english/errmsg.txt: Post-merge fixes. sql/share/estonian/errmsg.txt: Post-merge fixes. sql/sp.cc: Post-merge fixes. sql/sql_insert.cc: Post-merge fixes. sql/sql_table.cc: Post-merge fixes.
57 lines
1.6 KiB
Plaintext
57 lines
1.6 KiB
Plaintext
# Test for
|
|
# Bug #797: If a query is ignored on slave (replicate-ignore-table) the slave
|
|
# still checks that it has the same error as on the master.
|
|
|
|
source include/master-slave.inc;
|
|
connection master;
|
|
create table t1 (a int primary key);
|
|
# generate an error that goes to the binlog
|
|
--error 1062;
|
|
insert into t1 values (1),(1);
|
|
save_master_pos;
|
|
connection slave;
|
|
# as the t1 table is ignored on the slave, the slave should be able to sync
|
|
sync_with_master;
|
|
# The port number is different when doing the release build with
|
|
# Do-compile, hence we have to replace the port number here accordingly
|
|
--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
|
|
--replace_column 1 # 8 # 9 # 23 # 33 #
|
|
show slave status;
|
|
# check that the table has been ignored, because otherwise the test is nonsense
|
|
show tables like 't1';
|
|
connection master;
|
|
drop table t1;
|
|
save_master_pos;
|
|
connection slave;
|
|
sync_with_master;
|
|
|
|
# Now test that even critical errors (connection killed)
|
|
# are ignored if rules allow it.
|
|
# The "kill" idea was copied from rpl000001.test.
|
|
|
|
connection master1;
|
|
select get_lock('crash_lock%20C', 10);
|
|
|
|
connection master;
|
|
create table t2 (a int primary key);
|
|
insert into t2 values(1);
|
|
create table t3 (id int);
|
|
insert into t3 values(connection_id());
|
|
send update t2 set a = a + 1 + get_lock('crash_lock%20C', 10);
|
|
|
|
connection master1;
|
|
sleep 2;
|
|
select (@id := id) - id from t3;
|
|
kill @id;
|
|
drop table t2,t3;
|
|
connection master;
|
|
--error 0,1053;
|
|
reap;
|
|
connection master1;
|
|
show binlog events from 95;
|
|
save_master_pos;
|
|
connection slave;
|
|
# SQL slave thread should not have stopped (because table of the killed
|
|
# query is in the ignore list).
|
|
sync_with_master;
|