summaryrefslogtreecommitdiff
path: root/mysql-test/t/lock_multi.test
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2006-09-28 15:13:40 +0200
committermsvensson@neptunus.(none) <>2006-09-28 15:13:40 +0200
commit485772e30854e51b7fb7411c5c53f02e20011b77 (patch)
treeb32f8ef76a50a0b8ba8ae7067435060067fb83c3 /mysql-test/t/lock_multi.test
parentd1fb415ad4617ec20077446c762450ae0369e3ca (diff)
downloadmariadb-git-485772e30854e51b7fb7411c5c53f02e20011b77.tar.gz
Bug#22436 Four tests require "innodb" to be configured, fail in "classic" build
- Disable warnings when creating the "innodb" tables if it works anyway. - Move test that are really innodb dependent to innodb_mysql
Diffstat (limited to 'mysql-test/t/lock_multi.test')
-rw-r--r--mysql-test/t/lock_multi.test3
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