diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2006-12-26 20:22:17 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2006-12-26 20:22:17 +0400 |
| commit | 1aa1efdbd3cae8c9bc0524c92dda4c8084ec5b7c (patch) | |
| tree | 1ff41b1f4fd1ab61a1ca4d2abacdd5e306891dd6 /mysql-test/t/lock_multi.test | |
| parent | ab4c37dcce7f82493552d839920bf979f9af3ecb (diff) | |
| parent | bf075d8259d7c93f086b6892616504e848d4c162 (diff) | |
| download | mariadb-git-1aa1efdbd3cae8c9bc0524c92dda4c8084ec5b7c.tar.gz | |
Merge hf@192.168.21.12:work/embt/my50-embt
into mysql.com:/d2/hf/my51-embt
libmysqld/lib_sql.cc:
Auto merged
mysql-test/include/federated.inc:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/flush_block_commit.result:
Auto merged
mysql-test/t/flush_block_commit.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/join.test:
Auto merged
mysql-test/t/status.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
mysql-test/t/lock_multi.test:
Auto merged
Diffstat (limited to 'mysql-test/t/lock_multi.test')
| -rw-r--r-- | mysql-test/t/lock_multi.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/lock_multi.test b/mysql-test/t/lock_multi.test index 6c89a8b4a7b..2b92ddf76ec 100644 --- a/mysql-test/t/lock_multi.test +++ b/mysql-test/t/lock_multi.test @@ -1,3 +1,4 @@ +-- source include/not_embedded.inc --disable_warnings drop table if exists t1,t2; --enable_warnings |