database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl

Browse Source 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl


mysql-test/suite/rpl/r/rpl_loaddata.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_master_pos_wait.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_slave_status.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_master_pos_wait.test:
  Auto merged
mysql-test/suite/rpl/t/rpl_temporary.test:
  Auto merged
mysql-test/suite/rpl/t/rpl_loaddata.test:
  Manual merge. The rpl_loaddata.test file was moved on 5.1 by editing
  the file to include the file at the new location. This causes conflicts
  when merging, since the changes will not propagate to the moved file.
sql/slave.cc:
  Manual merge.
mysql-test/suite/rpl/t/rpl_skip_error.test:
  Manual merge.
mysql-test/suite/rpl/t/rpl_slave_status.test:
  Manual merge.
This commit is contained in:
unknown
2008-03-12 13:07:35 +01:00
parent 875ad6d8b8 0e679ab782
commit 62dee6f718
6 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
mysql-test/suite/rpl/t/rpl_skip_error.test
View File

@ -37,17 +37,23 @@ insert into t1 values (1);
# These should work fine
insert into t1 values (2),(3);
--echo [on slave]
sync_slave_with_master;
select * from t1 ORDER BY n;
save_master_pos;
connection slave;
sync_with_master;
select * from t1;
--echo ==== Test With sql_mode=strict_trans_tables ====
insert into t1 values (7), (8);
--echo [on master]
connection master;
drop table t1;
sync_slave_with_master;
# End of 4.1 tests
#
# #28839 Errors in strict mode silently stop SQL thread if --slave-skip-errors exists
#
connection master;
create table t1(a int primary key);
insert into t1 values (1),(2);
delete from t1 where @@server_id=1;
set sql_mode=strict_trans_tables;
insert into t1 values (7), (8), (9);
@ -62,5 +68,4 @@ source include/show_slave_status2.inc;
connection master;
drop table t1;
sync_slave_with_master;
# End of 5.0 tests