From 949cb948dec42a045ff54a768d9ef103cc0d4465 Mon Sep 17 00:00:00 2001 From: Elena Stepanova Date: Fri, 8 Nov 2013 23:20:50 +0400 Subject: [PATCH] InnoDB is built-in until XtraDB is merged --- storage/innobase/mysql-test/storage_engine/parts/suite.opt | 2 -- storage/innobase/mysql-test/storage_engine/suite.opt | 2 -- storage/innobase/mysql-test/storage_engine/trx/suite.opt | 2 -- 3 files changed, 6 deletions(-) diff --git a/storage/innobase/mysql-test/storage_engine/parts/suite.opt b/storage/innobase/mysql-test/storage_engine/parts/suite.opt index 28ae8786144..66f581b56d0 100644 --- a/storage/innobase/mysql-test/storage_engine/parts/suite.opt +++ b/storage/innobase/mysql-test/storage_engine/parts/suite.opt @@ -1,4 +1,2 @@ ---ignore-builtin-innodb ---plugin-load=ha_innodb --innodb diff --git a/storage/innobase/mysql-test/storage_engine/suite.opt b/storage/innobase/mysql-test/storage_engine/suite.opt index 28ae8786144..66f581b56d0 100644 --- a/storage/innobase/mysql-test/storage_engine/suite.opt +++ b/storage/innobase/mysql-test/storage_engine/suite.opt @@ -1,4 +1,2 @@ ---ignore-builtin-innodb ---plugin-load=ha_innodb --innodb diff --git a/storage/innobase/mysql-test/storage_engine/trx/suite.opt b/storage/innobase/mysql-test/storage_engine/trx/suite.opt index 2bf66f067f6..64bbe8b554c 100644 --- a/storage/innobase/mysql-test/storage_engine/trx/suite.opt +++ b/storage/innobase/mysql-test/storage_engine/trx/suite.opt @@ -1,5 +1,3 @@ ---ignore-builtin-innodb ---plugin-load=ha_innodb --innodb --innodb-lock-wait-timeout=1