From 18420c70def8c15f1ae0d815818ec75a934f62b8 Mon Sep 17 00:00:00 2001 From: Vasil Dimov Date: Wed, 7 Apr 2010 21:17:13 +0300 Subject: [PATCH] Repply changes to storage/innodb_plugin/mysql-test/*.opt that were made by MySQL --- storage/innodb_plugin/mysql-test/innodb-consistent-master.opt | 2 +- storage/innodb_plugin/mysql-test/innodb-master.opt | 2 +- .../innodb_plugin/mysql-test/innodb-semi-consistent-master.opt | 2 +- .../innodb_plugin/mysql-test/innodb-use-sys-malloc-master.opt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/storage/innodb_plugin/mysql-test/innodb-consistent-master.opt b/storage/innodb_plugin/mysql-test/innodb-consistent-master.opt index cb48f1aaf60..e76299453d3 100644 --- a/storage/innodb_plugin/mysql-test/innodb-consistent-master.opt +++ b/storage/innodb_plugin/mysql-test/innodb-consistent-master.opt @@ -1 +1 @@ ---loose-innodb_lock_wait_timeout=2 +--innodb_lock_wait_timeout=2 diff --git a/storage/innodb_plugin/mysql-test/innodb-master.opt b/storage/innodb_plugin/mysql-test/innodb-master.opt index 72c88068345..4901efb416c 100644 --- a/storage/innodb_plugin/mysql-test/innodb-master.opt +++ b/storage/innodb_plugin/mysql-test/innodb-master.opt @@ -1 +1 @@ ---binlog_cache_size=32768 --loose_innodb_lock_wait_timeout=1 +--binlog_cache_size=32768 --innodb_lock_wait_timeout=1 diff --git a/storage/innodb_plugin/mysql-test/innodb-semi-consistent-master.opt b/storage/innodb_plugin/mysql-test/innodb-semi-consistent-master.opt index cb48f1aaf60..e76299453d3 100644 --- a/storage/innodb_plugin/mysql-test/innodb-semi-consistent-master.opt +++ b/storage/innodb_plugin/mysql-test/innodb-semi-consistent-master.opt @@ -1 +1 @@ ---loose-innodb_lock_wait_timeout=2 +--innodb_lock_wait_timeout=2 diff --git a/storage/innodb_plugin/mysql-test/innodb-use-sys-malloc-master.opt b/storage/innodb_plugin/mysql-test/innodb-use-sys-malloc-master.opt index fc8582b5887..acf3b8729ed 100644 --- a/storage/innodb_plugin/mysql-test/innodb-use-sys-malloc-master.opt +++ b/storage/innodb_plugin/mysql-test/innodb-use-sys-malloc-master.opt @@ -1 +1 @@ ---loose-innodb-use-sys-malloc=true +--innodb-use-sys-malloc=true