diff options
| author | unknown <joreland@mysql.com> | 2005-08-08 22:21:43 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-08-08 22:21:43 +0200 |
| commit | 5088fefb634a201fe2d210d1237323e8e6072786 (patch) | |
| tree | c90cea0c1ba8391a65ea73deb2ed7046301b2905 /mysql-test/t/rpl_deadlock.test | |
| parent | e399e93237b7639241a73ec65aa658110e1f4c03 (diff) | |
| parent | fa695c2168071705bb11bb0311f63c2ed171884c (diff) | |
| download | mariadb-git-5088fefb634a201fe2d210d1237323e8e6072786.tar.gz | |
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/jonas/src/mysql-5.1-push
mysql-test/t/ndb_partition_key.test:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
storage/ndb/tools/Makefile.am:
Auto merged
storage/ndb/tools/ndb_condig.cpp:
Auto merged
Diffstat (limited to 'mysql-test/t/rpl_deadlock.test')
| -rw-r--r-- | mysql-test/t/rpl_deadlock.test | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/t/rpl_deadlock.test b/mysql-test/t/rpl_deadlock.test index eb4c5c33714..d31ef3a5bef 100644 --- a/mysql-test/t/rpl_deadlock.test +++ b/mysql-test/t/rpl_deadlock.test @@ -109,3 +109,5 @@ show slave status; connection master; drop table t1,t2,t3,t4; sync_slave_with_master; + +# End of 4.1 tests |