1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-maint

Browse Source 
into  mysql.com:/data2/mysql-5.1-maint
This commit is contained in:
jmiller/ndbdev@ndb08.mysql.com 2007-06-13 17:44:21 +02:00
commit 8b44b6f593
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/t/rpl_known_bugs_detection.test
View File

@ -79,7 +79,7 @@ ON DUPLICATE KEY UPDATE
t1.field_3 = t2.field_c; t1.field_3 = t2.field_c;
SELECT * FROM t1; SELECT * FROM t1;
connection slave; connection slave;
--source include/wait_for_slave_to_stop.inc --source include/wait_for_slave_sql_to_stop.inc
# show the error message # show the error message
--replace_column 1 # 4 # 7 # 8 # 9 # 23 # 33 # --replace_column 1 # 4 # 7 # 8 # 9 # 23 # 33 #
--query_vertical show slave status; --query_vertical show slave status;