diff options
| author | unknown <anozdrin/alik@alik.> | 2006-11-07 13:50:00 +0300 |
|---|---|---|
| committer | unknown <anozdrin/alik@alik.> | 2006-11-07 13:50:00 +0300 |
| commit | 871378bc697c59f87b99c64d243136948b1f9d6f (patch) | |
| tree | 42fb1db881900588ca6d4b0cce2a7d825736863a /mysql-test/t/lock_multi.test | |
| parent | e5bd94b2d4fd6937a0f5ff53a295fe14a83ccaef (diff) | |
| parent | 024a1781a6310383c1e352d483e7a701d564d051 (diff) | |
| download | mariadb-git-871378bc697c59f87b99c64d243136948b1f9d6f.tar.gz | |
Merge alik.:/mnt/raid/alik/MySQL/devel/5.0
into alik.:/mnt/raid/alik/MySQL/devel/5.0-rt
configure.in:
Auto merged
include/my_time.h:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/rename.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
Auto merged
mysql-test/t/rename.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql-common/my_time.c:
Auto merged
sql/time.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/lock_multi.test')
| -rw-r--r-- | mysql-test/t/lock_multi.test | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/t/lock_multi.test b/mysql-test/t/lock_multi.test index 627c33b3d82..33e268ccb11 100644 --- a/mysql-test/t/lock_multi.test +++ b/mysql-test/t/lock_multi.test @@ -225,7 +225,10 @@ DROP TABLE t1; # Bug #17264: MySQL Server freeze # connection locker; +# Disable warnings to allow test to run also without InnoDB +--disable_warnings create table t1 (f1 int(12) unsigned not null auto_increment, primary key(f1)) engine=innodb; +--enable_warnings lock tables t1 write; connection writer; --sleep 2 |