diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-10-20 13:53:39 -0600 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-10-20 13:53:39 -0600 |
| commit | e933e647692c10d1f0f28c29ee6c3b41c83968dd (patch) | |
| tree | bdb49ecf35b39c34ff258c071596cf238697fc9d /mysql-test/t/lock_multi.test | |
| parent | ff66bc05f741ec1d3041413f8dba14b4f7891501 (diff) | |
| parent | 5a88282ec06c466218ea26ebbee43b0a50d25025 (diff) | |
| download | mariadb-git-e933e647692c10d1f0f28c29ee6c3b41c83968dd.tar.gz | |
Merge siva.hindu.god:/usr/home/tim/m/bk/50
into siva.hindu.god:/usr/home/tim/m/bk/51
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/extra/rpl_tests/rpl_log.test:
Auto merged
mysql-test/extra/rpl_tests/rpl_max_relay_size.test:
Auto merged
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/lib/mtr_misc.pl:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/r/rpl_000015.result:
Auto merged
mysql-test/r/rpl_change_master.result:
Auto merged
mysql-test/r/rpl_err_ignoredtable.result:
Auto merged
mysql-test/r/rpl_loaddata.result:
Auto merged
mysql-test/r/rpl_replicate_do.result:
Auto merged
mysql-test/r/rpl_stm_log.result:
Auto merged
mysql-test/r/rpl_stm_max_relay_size.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/lock_multi.test:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/rpl_000015.test:
Auto merged
mysql-test/t/rpl_change_master.test:
Auto merged
mysql-test/t/rpl_drop_db.test:
Auto merged
mysql-test/t/rpl_err_ignoredtable.test:
Auto merged
mysql-test/t/rpl_loaddata.test:
Auto merged
mysql-test/t/rpl_replicate_do.test:
Auto merged
mysql-test/t/rpl_stm_log-master.opt:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/sql_class.cc:
Auto merged
mysql-test/include/mix1.inc:
Manual merge (use local)
mysql-test/r/create.result:
SCCS merged
mysql-test/r/innodb_mysql.result:
!bkm
Manual merge (use local)
mysql-test/t/sp.test:
Manual merge (use local)
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 9c9e68f931f..765da1ee18d 100644 --- a/mysql-test/t/lock_multi.test +++ b/mysql-test/t/lock_multi.test @@ -244,7 +244,10 @@ DROP DATABASE mysqltest_1; # 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 |