diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2008-02-19 14:47:29 +0100 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2008-02-19 14:47:29 +0100 |
| commit | c0f54824ad93732e00b30b4dc085d750de589a14 (patch) | |
| tree | 3f62e9824d92402b44b01c53416091e7bb20dbd3 /mysql-test/extra | |
| parent | 410e2d64d14fc2ea5193fc0111142aca182ed348 (diff) | |
| parent | 4e8ee2ecc3879fdc570c7e2832de254333619cbb (diff) | |
| download | mariadb-git-c0f54824ad93732e00b30b4dc085d750de589a14.tar.gz | |
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/slave.cc:
Auto merged
Diffstat (limited to 'mysql-test/extra')
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test b/mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test index 7f19245c0b9..1677aaf8277 100644 --- a/mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test +++ b/mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test @@ -342,5 +342,6 @@ SHOW CREATE TABLE t1; --echo --- Do Cleanup --- DROP TABLE IF EXISTS t1; +sync_slave_with_master; # End of 5.1 test case |