mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 03:47:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge bk-internal:/home/bk/mysql-5.1

Browse source 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
This commit is contained in:
msvensson@neptunus.(none) 2006-06-10 20:33:50 +02:00
commit 2c538f6cde
65 changed files with 1699 additions and 902 deletions
Download patch file Download diff file Expand all files Collapse all files

3
mysql-test/extra/rpl_tests/rpl_insert_id_pk.test
View file

@ -83,5 +83,6 @@ SET FOREIGN_KEY_CHECKS=0;
--error 1022, 1062
INSERT INTO t1 VALUES (1),(1);
sync_slave_with_master;
connection master;
drop table t1;
# End of 4.1 tests

2
mysql-test/extra/rpl_tests/rpl_loaddata.test
View file

@ -152,5 +152,5 @@ wait_for_slave_to_stop;
drop table t2;
connection master;
drop table t2;
drop table t1;
# End of 4.1 tests

2
mysql-test/extra/rpl_tests/rpl_log.test
View file

@ -126,7 +126,7 @@ show slave status;
show binlog events in 'slave-bin.000005' from 4;
# The table drops caused Cluster Replication wrapper to fail as event ID would never be the same.# Moving drops here.
connection master;
DROP TABLE t1;
DROP TABLE t2;
DROP TABLE t3;

2
mysql-test/extra/rpl_tests/rpl_multi_update3.test
View file

@ -217,4 +217,6 @@ select "-- SLAVE AFTER JOIN --" as "";
select * from t1;
select * from t2;
connection master;
DROP TABLE t1, t2;
# End of 4.1 tests

1
mysql-test/extra/rpl_tests/rpl_row_sp006.test
View file

@ -76,6 +76,7 @@ DROP PROCEDURE IF EXISTS mysqltest1.p1;
DROP PROCEDURE IF EXISTS mysqltest1.p2;
DROP TABLE IF EXISTS mysqltest1.t1;
DROP TABLE IF EXISTS mysqltest1.t2;
DROP DATABASE mysqltest1;
# Lets compare. Note: If they match test will pass, if they do not match
# the test will show that the diff statement failed and not reject file