From 9429e359757c489c105d506bbf58596d30a07459 Mon Sep 17 00:00:00 2001 From: marko Date: Tue, 17 Nov 2009 11:51:16 +0000 Subject: [PATCH] branches/zip: Prepend loose_ to plugin-only mysql-test options. --- mysql-test/innodb-consistent-master.opt | 2 +- mysql-test/innodb-master.opt | 2 +- mysql-test/innodb-semi-consistent-master.opt | 2 +- mysql-test/innodb-use-sys-malloc-master.opt | 3 +-- mysql-test/innodb_bug42101-nonzero-master.opt | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/mysql-test/innodb-consistent-master.opt b/mysql-test/innodb-consistent-master.opt index e76299453d3..cb48f1aaf60 100644 --- a/mysql-test/innodb-consistent-master.opt +++ b/mysql-test/innodb-consistent-master.opt @@ -1 +1 @@ ---innodb_lock_wait_timeout=2 +--loose-innodb_lock_wait_timeout=2 diff --git a/mysql-test/innodb-master.opt b/mysql-test/innodb-master.opt index 4901efb416c..72c88068345 100644 --- a/mysql-test/innodb-master.opt +++ b/mysql-test/innodb-master.opt @@ -1 +1 @@ ---binlog_cache_size=32768 --innodb_lock_wait_timeout=1 +--binlog_cache_size=32768 --loose_innodb_lock_wait_timeout=1 diff --git a/mysql-test/innodb-semi-consistent-master.opt b/mysql-test/innodb-semi-consistent-master.opt index e76299453d3..cb48f1aaf60 100644 --- a/mysql-test/innodb-semi-consistent-master.opt +++ b/mysql-test/innodb-semi-consistent-master.opt @@ -1 +1 @@ ---innodb_lock_wait_timeout=2 +--loose-innodb_lock_wait_timeout=2 diff --git a/mysql-test/innodb-use-sys-malloc-master.opt b/mysql-test/innodb-use-sys-malloc-master.opt index 889834add01..fc8582b5887 100644 --- a/mysql-test/innodb-use-sys-malloc-master.opt +++ b/mysql-test/innodb-use-sys-malloc-master.opt @@ -1,2 +1 @@ ---innodb-use-sys-malloc=true ---innodb-use-sys-malloc=true +--loose-innodb-use-sys-malloc=true diff --git a/mysql-test/innodb_bug42101-nonzero-master.opt b/mysql-test/innodb_bug42101-nonzero-master.opt index d71dbe17d5b..455d66a06b8 100644 --- a/mysql-test/innodb_bug42101-nonzero-master.opt +++ b/mysql-test/innodb_bug42101-nonzero-master.opt @@ -1 +1 @@ ---innodb_commit_concurrency=1 +--loose_innodb_commit_concurrency=1