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 hf@192.168.21.12:work/embt/my50-embt

Browse Source 
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
This commit is contained in:
unknown
2006-12-26 20:22:17 +04:00
parent ab4c37dcce bf075d8259
commit 1aa1efdbd3
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/t/lock_multi.test
View File

@ -1,3 +1,4 @@
-- source include/not_embedded.inc
--disable_warnings
drop table if exists t1,t2;
--enable_warnings