database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

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

Browse Source 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new


mysql-test/r/rpl_ndb_sync.result:
  manual merge
mysql-test/t/disabled.def:
  SCCS merged
mysql-test/t/rpl_ndb_sync.test:
  manual merge
This commit is contained in:
unknown
2006-02-10 12:58:55 +01:00
parent c7766a9597 545ac7f323
commit 46e4eabf80
24 changed files with 221 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/extra/rpl_tests/rpl_row_sp003.test
View File

@ -46,7 +46,10 @@ CALL test.p2();
SELECT release_lock("test");
SELECT * FROM test.t1;
#show binlog events;
# Added sleep for use with NDB to ensure that
# the injector thread will populate log before
# we switch to the slave.
sleep 5;
sync_slave_with_master;
connection slave;
SELECT * FROM test.t1;