List:Commits« Previous MessageNext Message »
From:horst.hunger Date:March 6 2012 5:17pm
Subject:bzr push into mysql-trunk-wl5824 branch (horst.hunger:3840 to 3841) WL#5824
View as plain text  
 3841 horst.hunger@stripped	2012-03-06
      wl#5824: Again modification in test to run them on Windows without failing.

    modified:
      mysql-test/suite/memcached/t/memc212_2_cols-master.opt
      mysql-test/suite/memcached/t/memc212_2_cols.test
      mysql-test/suite/memcached/t/memc213_2_intcols-master.opt
      mysql-test/suite/memcached/t/memc213_2_intcols.test
      mysql-test/suite/memcached/t/memc214_5_cols-master.opt
      mysql-test/suite/memcached/t/memc214_5_cols.test
      mysql-test/suite/memcached/t/memc215_50_cols-master.opt
      mysql-test/suite/memcached/t/memc215_50_cols.test
      mysql-test/suite/memcached/t/memc216_5_utf8-master.opt
      mysql-test/suite/memcached/t/memc216_5_utf8.test
      mysql-test/suite/memcached/t/memc217_add-master.opt
      mysql-test/suite/memcached/t/memc217_add.test
      mysql-test/suite/memcached/t/memc218_decr-master.opt
      mysql-test/suite/memcached/t/memc218_decr.test
      mysql-test/suite/memcached/t/memc219_delete-master.opt
      mysql-test/suite/memcached/t/memc219_delete.test
      mysql-test/suite/memcached/t/memc220_fkey_1-master.opt
      mysql-test/suite/memcached/t/memc220_fkey_1.test
      mysql-test/suite/memcached/t/memc221_get-master.opt
      mysql-test/suite/memcached/t/memc221_get.test
      mysql-test/suite/memcached/t/memc222_incr-master.opt
      mysql-test/suite/memcached/t/memc222_incr.test
      mysql-test/suite/memcached/t/memc223_index_1-master.opt
      mysql-test/suite/memcached/t/memc223_index_1.test
      mysql-test/suite/memcached/t/memc224_index_2-master.opt
      mysql-test/suite/memcached/t/memc224_index_2.test
      mysql-test/suite/memcached/t/memc225_index_3-master.opt
      mysql-test/suite/memcached/t/memc225_index_3.test
      mysql-test/suite/memcached/t/memc226_index_4-master.opt
      mysql-test/suite/memcached/t/memc226_index_4.test
      mysql-test/suite/memcached/t/memc227_lock-master.opt
      mysql-test/suite/memcached/t/memc227_lock.test
      mysql-test/suite/memcached/t/memc228_mdl_1-master.opt
      mysql-test/suite/memcached/t/memc228_mdl_1.test
      mysql-test/suite/memcached/t/memc229_mdl_2-master.opt
      mysql-test/suite/memcached/t/memc229_mdl_2.test
      mysql-test/suite/memcached/t/memc230_mdl_3-master.opt
      mysql-test/suite/memcached/t/memc230_mdl_3.test
      mysql-test/suite/memcached/t/memc231_mdl_4-master.opt
      mysql-test/suite/memcached/t/memc231_mdl_4.test
      mysql-test/suite/memcached/t/memc232_NULL_cols-master.opt
      mysql-test/suite/memcached/t/memc232_NULL_cols.test
      mysql-test/suite/memcached/t/memc233_option-master.opt
      mysql-test/suite/memcached/t/memc233_option.test
      mysql-test/suite/memcached/t/memc234_r_batch_1-master.opt
      mysql-test/suite/memcached/t/memc234_r_batch_1.test
      mysql-test/suite/memcached/t/memc235_r_batch_2-master.opt
      mysql-test/suite/memcached/t/memc235_r_batch_2.test
      mysql-test/suite/memcached/t/memc236_r_batch_3-master.opt
      mysql-test/suite/memcached/t/memc236_r_batch_3.test
      mysql-test/suite/memcached/t/memc237_sep_1-master.opt
      mysql-test/suite/memcached/t/memc237_sep_1.test
      mysql-test/suite/memcached/t/memc238_sep_2-master.opt
      mysql-test/suite/memcached/t/memc238_sep_2.test
      mysql-test/suite/memcached/t/memc239_sep_3-master.opt
      mysql-test/suite/memcached/t/memc239_sep_3.test
      mysql-test/suite/memcached/t/memc240_sep_4-master.opt
      mysql-test/suite/memcached/t/memc240_sep_4.test
      mysql-test/suite/memcached/t/memc241_replace-master.opt
      mysql-test/suite/memcached/t/memc241_replace.test
      mysql-test/suite/memcached/t/memc242_set-master.opt
      mysql-test/suite/memcached/t/memc242_set.test
      mysql-test/suite/memcached/t/memc243_view-master.opt
      mysql-test/suite/memcached/t/memc243_view.test
      mysql-test/suite/memcached/t/memc244_w_batch_1-master.opt
      mysql-test/suite/memcached/t/memc244_w_batch_1.test
      mysql-test/suite/memcached/t/memc245_w_batch_2-master.opt
      mysql-test/suite/memcached/t/memc245_w_batch_2.test
      mysql-test/suite/memcached/t/memc246_w_batch_3-master.opt
      mysql-test/suite/memcached/t/memc246_w_batch_3.test
 3840 horst.hunger@stripped	2012-03-06
      wl#5824: Modified tests to have better results.

    added:
      mysql-test/suite/memcached/README
    modified:
      mysql-test/suite/memcached/r/memc212_2_cols.result
      mysql-test/suite/memcached/r/memc213_2_intcols.result
      mysql-test/suite/memcached/r/memc214_5_cols.result
      mysql-test/suite/memcached/r/memc215_50_cols.result
      mysql-test/suite/memcached/r/memc216_5_utf8.result
      mysql-test/suite/memcached/r/memc217_add.result
      mysql-test/suite/memcached/r/memc218_decr.result
      mysql-test/suite/memcached/r/memc219_delete.result
      mysql-test/suite/memcached/r/memc221_get.result
      mysql-test/suite/memcached/r/memc222_incr.result
      mysql-test/suite/memcached/r/memc223_index_1.result
      mysql-test/suite/memcached/r/memc224_index_2.result
      mysql-test/suite/memcached/r/memc225_index_3.result
      mysql-test/suite/memcached/r/memc226_index_4.result
      mysql-test/suite/memcached/r/memc227_lock.result
      mysql-test/suite/memcached/r/memc228_mdl_1.result
      mysql-test/suite/memcached/r/memc229_mdl_2.result
      mysql-test/suite/memcached/r/memc230_mdl_3.result
      mysql-test/suite/memcached/r/memc231_mdl_4.result
      mysql-test/suite/memcached/r/memc232_NULL_cols.result
      mysql-test/suite/memcached/r/memc233_option.result
      mysql-test/suite/memcached/r/memc234_r_batch_1.result
      mysql-test/suite/memcached/r/memc235_r_batch_2.result
      mysql-test/suite/memcached/r/memc236_r_batch_3.result
      mysql-test/suite/memcached/r/memc237_sep_1.result
      mysql-test/suite/memcached/r/memc238_sep_2.result
      mysql-test/suite/memcached/r/memc239_sep_3.result
      mysql-test/suite/memcached/r/memc240_sep_4.result
      mysql-test/suite/memcached/r/memc241_replace.result
      mysql-test/suite/memcached/r/memc242_set.result
      mysql-test/suite/memcached/r/memc243_view.result
      mysql-test/suite/memcached/r/memc244_w_batch_1.result
      mysql-test/suite/memcached/r/memc245_w_batch_2.result
      mysql-test/suite/memcached/r/memc246_w_batch_3.result
      mysql-test/suite/memcached/t/memc212_2_cols.test
      mysql-test/suite/memcached/t/memc213_2_intcols.test
      mysql-test/suite/memcached/t/memc214_5_cols.test
      mysql-test/suite/memcached/t/memc215_50_cols.test
      mysql-test/suite/memcached/t/memc216_5_utf8.test
      mysql-test/suite/memcached/t/memc217_add.test
      mysql-test/suite/memcached/t/memc218_decr.test
      mysql-test/suite/memcached/t/memc219_delete.test
      mysql-test/suite/memcached/t/memc220_fkey_1.test
      mysql-test/suite/memcached/t/memc221_get.test
      mysql-test/suite/memcached/t/memc222_incr.test
      mysql-test/suite/memcached/t/memc223_index_1.test
      mysql-test/suite/memcached/t/memc224_index_2.test
      mysql-test/suite/memcached/t/memc225_index_3.test
      mysql-test/suite/memcached/t/memc226_index_4.test
      mysql-test/suite/memcached/t/memc227_lock.test
      mysql-test/suite/memcached/t/memc228_mdl_1.test
      mysql-test/suite/memcached/t/memc229_mdl_2.test
      mysql-test/suite/memcached/t/memc230_mdl_3.test
      mysql-test/suite/memcached/t/memc231_mdl_4.test
      mysql-test/suite/memcached/t/memc232_NULL_cols.test
      mysql-test/suite/memcached/t/memc233_option.test
      mysql-test/suite/memcached/t/memc234_r_batch_1.test
      mysql-test/suite/memcached/t/memc235_r_batch_2.test
      mysql-test/suite/memcached/t/memc236_r_batch_3.test
      mysql-test/suite/memcached/t/memc237_sep_1.test
      mysql-test/suite/memcached/t/memc238_sep_2.test
      mysql-test/suite/memcached/t/memc239_sep_3.test
      mysql-test/suite/memcached/t/memc240_sep_4.test
      mysql-test/suite/memcached/t/memc241_replace.test
      mysql-test/suite/memcached/t/memc242_set.test
      mysql-test/suite/memcached/t/memc243_view.test
      mysql-test/suite/memcached/t/memc244_w_batch_1.test
      mysql-test/suite/memcached/t/memc245_w_batch_2.test
      mysql-test/suite/memcached/t/memc246_w_batch_3.test
=== modified file 'mysql-test/suite/memcached/t/memc212_2_cols-master.opt'
--- a/mysql-test/suite/memcached/t/memc212_2_cols-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc212_2_cols-master.opt	2012-03-06 11:15:53 +0000
@@ -1,4 +1,4 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11212"

=== modified file 'mysql-test/suite/memcached/t/memc212_2_cols.test'
--- a/mysql-test/suite/memcached/t/memc212_2_cols.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc212_2_cols.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
-SET @tx_isolation= @@global.tx_isolation;
-SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-
---enable_connect_log
 source include/not_windows.inc;
 source include/have_innodb.inc;
 
+--enable_connect_log
+SET @tx_isolation= @@global.tx_isolation;
+SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc213_2_intcols-master.opt'
--- a/mysql-test/suite/memcached/t/memc213_2_intcols-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc213_2_intcols-master.opt	2012-03-06 11:15:53 +0000
@@ -1,4 +1,4 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11213"

=== modified file 'mysql-test/suite/memcached/t/memc213_2_intcols.test'
--- a/mysql-test/suite/memcached/t/memc213_2_intcols.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc213_2_intcols.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc214_5_cols-master.opt'
--- a/mysql-test/suite/memcached/t/memc214_5_cols-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc214_5_cols-master.opt	2012-03-06 11:15:53 +0000
@@ -1,4 +1,4 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11214"

=== modified file 'mysql-test/suite/memcached/t/memc214_5_cols.test'
--- a/mysql-test/suite/memcached/t/memc214_5_cols.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc214_5_cols.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
 --enable_connect_log
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc215_50_cols-master.opt'
--- a/mysql-test/suite/memcached/t/memc215_50_cols-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc215_50_cols-master.opt	2012-03-06 11:15:53 +0000
@@ -1,4 +1,4 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11215"

=== modified file 'mysql-test/suite/memcached/t/memc215_50_cols.test'
--- a/mysql-test/suite/memcached/t/memc215_50_cols.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc215_50_cols.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc216_5_utf8-master.opt'
--- a/mysql-test/suite/memcached/t/memc216_5_utf8-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc216_5_utf8-master.opt	2012-03-06 11:15:53 +0000
@@ -1,4 +1,4 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11216"

=== modified file 'mysql-test/suite/memcached/t/memc216_5_utf8.test'
--- a/mysql-test/suite/memcached/t/memc216_5_utf8.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc216_5_utf8.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc217_add-master.opt'
--- a/mysql-test/suite/memcached/t/memc217_add-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc217_add-master.opt	2012-03-06 11:15:53 +0000
@@ -1,4 +1,4 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11217"

=== modified file 'mysql-test/suite/memcached/t/memc217_add.test'
--- a/mysql-test/suite/memcached/t/memc217_add.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc217_add.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc218_decr-master.opt'
--- a/mysql-test/suite/memcached/t/memc218_decr-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc218_decr-master.opt	2012-03-06 11:15:53 +0000
@@ -1,4 +1,4 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11218"

=== modified file 'mysql-test/suite/memcached/t/memc218_decr.test'
--- a/mysql-test/suite/memcached/t/memc218_decr.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc218_decr.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc219_delete-master.opt'
--- a/mysql-test/suite/memcached/t/memc219_delete-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc219_delete-master.opt	2012-03-06 11:15:53 +0000
@@ -1,4 +1,4 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11219"

=== modified file 'mysql-test/suite/memcached/t/memc219_delete.test'
--- a/mysql-test/suite/memcached/t/memc219_delete.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc219_delete.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc220_fkey_1-master.opt'
--- a/mysql-test/suite/memcached/t/memc220_fkey_1-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc220_fkey_1-master.opt	2012-03-06 11:15:53 +0000
@@ -1,4 +1,4 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11220"

=== modified file 'mysql-test/suite/memcached/t/memc220_fkey_1.test'
--- a/mysql-test/suite/memcached/t/memc220_fkey_1.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc220_fkey_1.test	2012-03-06 11:15:53 +0000
@@ -5,13 +5,13 @@ CALL mtr.add_suppression("InnoDB: Warnin
 CALL mtr.add_suppression("InnoDB: Error: MySQL is freeing a thd");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc221_get-master.opt'
--- a/mysql-test/suite/memcached/t/memc221_get-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc221_get-master.opt	2012-03-06 11:15:53 +0000
@@ -1,4 +1,4 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11221"

=== modified file 'mysql-test/suite/memcached/t/memc221_get.test'
--- a/mysql-test/suite/memcached/t/memc221_get.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc221_get.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc222_incr-master.opt'
--- a/mysql-test/suite/memcached/t/memc222_incr-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc222_incr-master.opt	2012-03-06 11:15:53 +0000
@@ -1,4 +1,4 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11222"

=== modified file 'mysql-test/suite/memcached/t/memc222_incr.test'
--- a/mysql-test/suite/memcached/t/memc222_incr.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc222_incr.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc223_index_1-master.opt'
--- a/mysql-test/suite/memcached/t/memc223_index_1-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc223_index_1-master.opt	2012-03-06 11:15:53 +0000
@@ -1,4 +1,4 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11223"

=== modified file 'mysql-test/suite/memcached/t/memc223_index_1.test'
--- a/mysql-test/suite/memcached/t/memc223_index_1.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc223_index_1.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc224_index_2-master.opt'
--- a/mysql-test/suite/memcached/t/memc224_index_2-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc224_index_2-master.opt	2012-03-06 11:15:53 +0000
@@ -1,4 +1,4 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11224"

=== modified file 'mysql-test/suite/memcached/t/memc224_index_2.test'
--- a/mysql-test/suite/memcached/t/memc224_index_2.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc224_index_2.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc225_index_3-master.opt'
--- a/mysql-test/suite/memcached/t/memc225_index_3-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc225_index_3-master.opt	2012-03-06 11:15:53 +0000
@@ -1,4 +1,4 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11225"

=== modified file 'mysql-test/suite/memcached/t/memc225_index_3.test'
--- a/mysql-test/suite/memcached/t/memc225_index_3.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc225_index_3.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
  
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc226_index_4-master.opt'
--- a/mysql-test/suite/memcached/t/memc226_index_4-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc226_index_4-master.opt	2012-03-06 11:15:53 +0000
@@ -1,4 +1,4 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11226"

=== modified file 'mysql-test/suite/memcached/t/memc226_index_4.test'
--- a/mysql-test/suite/memcached/t/memc226_index_4.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc226_index_4.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc227_lock-master.opt'
--- a/mysql-test/suite/memcached/t/memc227_lock-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc227_lock-master.opt	2012-03-06 11:15:53 +0000
@@ -1,4 +1,4 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11227"

=== modified file 'mysql-test/suite/memcached/t/memc227_lock.test'
--- a/mysql-test/suite/memcached/t/memc227_lock.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc227_lock.test	2012-03-06 11:15:53 +0000
@@ -5,13 +5,13 @@ CALL mtr.add_suppression("InnoDB: Warnin
 --enable_query_log
 --enable_connect_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc228_mdl_1-master.opt'
--- a/mysql-test/suite/memcached/t/memc228_mdl_1-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc228_mdl_1-master.opt	2012-03-06 11:15:53 +0000
@@ -1,4 +1,4 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11228"

=== modified file 'mysql-test/suite/memcached/t/memc228_mdl_1.test'
--- a/mysql-test/suite/memcached/t/memc228_mdl_1.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc228_mdl_1.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc229_mdl_2-master.opt'
--- a/mysql-test/suite/memcached/t/memc229_mdl_2-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc229_mdl_2-master.opt	2012-03-06 11:15:53 +0000
@@ -1,4 +1,4 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11229"

=== modified file 'mysql-test/suite/memcached/t/memc229_mdl_2.test'
--- a/mysql-test/suite/memcached/t/memc229_mdl_2.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc229_mdl_2.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc230_mdl_3-master.opt'
--- a/mysql-test/suite/memcached/t/memc230_mdl_3-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc230_mdl_3-master.opt	2012-03-06 11:15:53 +0000
@@ -1,4 +1,4 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11230"

=== modified file 'mysql-test/suite/memcached/t/memc230_mdl_3.test'
--- a/mysql-test/suite/memcached/t/memc230_mdl_3.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc230_mdl_3.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc231_mdl_4-master.opt'
--- a/mysql-test/suite/memcached/t/memc231_mdl_4-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc231_mdl_4-master.opt	2012-03-06 11:15:53 +0000
@@ -1,4 +1,4 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11231"

=== modified file 'mysql-test/suite/memcached/t/memc231_mdl_4.test'
--- a/mysql-test/suite/memcached/t/memc231_mdl_4.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc231_mdl_4.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc232_NULL_cols-master.opt'
--- a/mysql-test/suite/memcached/t/memc232_NULL_cols-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc232_NULL_cols-master.opt	2012-03-06 11:15:53 +0000
@@ -1,4 +1,4 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11232"

=== modified file 'mysql-test/suite/memcached/t/memc232_NULL_cols.test'
--- a/mysql-test/suite/memcached/t/memc232_NULL_cols.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc232_NULL_cols.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc233_option-master.opt'
--- a/mysql-test/suite/memcached/t/memc233_option-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc233_option-master.opt	2012-03-06 11:15:53 +0000
@@ -1,4 +1,4 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11233"

=== modified file 'mysql-test/suite/memcached/t/memc233_option.test'
--- a/mysql-test/suite/memcached/t/memc233_option.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc233_option.test	2012-03-06 11:15:53 +0000
@@ -4,15 +4,15 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 SHOW VARIABLES LIKE 'daemon_memcached_option';
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc234_r_batch_1-master.opt'
--- a/mysql-test/suite/memcached/t/memc234_r_batch_1-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc234_r_batch_1-master.opt	2012-03-06 11:15:53 +0000
@@ -1,5 +1,5 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_r_batch_size=-1
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_r_batch_size=-1
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11234"

=== modified file 'mysql-test/suite/memcached/t/memc234_r_batch_1.test'
--- a/mysql-test/suite/memcached/t/memc234_r_batch_1.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc234_r_batch_1.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc235_r_batch_2-master.opt'
--- a/mysql-test/suite/memcached/t/memc235_r_batch_2-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc235_r_batch_2-master.opt	2012-03-06 11:15:53 +0000
@@ -1,5 +1,5 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_r_batch_size=0
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_r_batch_size=0
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11235"

=== modified file 'mysql-test/suite/memcached/t/memc235_r_batch_2.test'
--- a/mysql-test/suite/memcached/t/memc235_r_batch_2.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc235_r_batch_2.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc236_r_batch_3-master.opt'
--- a/mysql-test/suite/memcached/t/memc236_r_batch_3-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc236_r_batch_3-master.opt	2012-03-06 11:15:53 +0000
@@ -1,5 +1,5 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_r_batch_size=2
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_r_batch_size=2
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11236"

=== modified file 'mysql-test/suite/memcached/t/memc236_r_batch_3.test'
--- a/mysql-test/suite/memcached/t/memc236_r_batch_3.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc236_r_batch_3.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc237_sep_1-master.opt'
--- a/mysql-test/suite/memcached/t/memc237_sep_1-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc237_sep_1-master.opt	2012-03-06 11:15:53 +0000
@@ -1,4 +1,4 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11237"

=== modified file 'mysql-test/suite/memcached/t/memc237_sep_1.test'
--- a/mysql-test/suite/memcached/t/memc237_sep_1.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc237_sep_1.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc238_sep_2-master.opt'
--- a/mysql-test/suite/memcached/t/memc238_sep_2-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc238_sep_2-master.opt	2012-03-06 11:15:53 +0000
@@ -1,4 +1,4 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11238"

=== modified file 'mysql-test/suite/memcached/t/memc238_sep_2.test'
--- a/mysql-test/suite/memcached/t/memc238_sep_2.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc238_sep_2.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc239_sep_3-master.opt'
--- a/mysql-test/suite/memcached/t/memc239_sep_3-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc239_sep_3-master.opt	2012-03-06 11:15:53 +0000
@@ -1,4 +1,4 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11239"

=== modified file 'mysql-test/suite/memcached/t/memc239_sep_3.test'
--- a/mysql-test/suite/memcached/t/memc239_sep_3.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc239_sep_3.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc240_sep_4-master.opt'
--- a/mysql-test/suite/memcached/t/memc240_sep_4-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc240_sep_4-master.opt	2012-03-06 11:15:53 +0000
@@ -1,4 +1,4 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11240"

=== modified file 'mysql-test/suite/memcached/t/memc240_sep_4.test'
--- a/mysql-test/suite/memcached/t/memc240_sep_4.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc240_sep_4.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc241_replace-master.opt'
--- a/mysql-test/suite/memcached/t/memc241_replace-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc241_replace-master.opt	2012-03-06 11:15:53 +0000
@@ -1,4 +1,4 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11241"

=== modified file 'mysql-test/suite/memcached/t/memc241_replace.test'
--- a/mysql-test/suite/memcached/t/memc241_replace.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc241_replace.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc242_set-master.opt'
--- a/mysql-test/suite/memcached/t/memc242_set-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc242_set-master.opt	2012-03-06 11:15:53 +0000
@@ -1,4 +1,4 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11242"

=== modified file 'mysql-test/suite/memcached/t/memc242_set.test'
--- a/mysql-test/suite/memcached/t/memc242_set.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc242_set.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 # Create the memcached tables

=== modified file 'mysql-test/suite/memcached/t/memc243_view-master.opt'
--- a/mysql-test/suite/memcached/t/memc243_view-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc243_view-master.opt	2012-03-06 11:15:53 +0000
@@ -1,4 +1,4 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11243"

=== modified file 'mysql-test/suite/memcached/t/memc243_view.test'
--- a/mysql-test/suite/memcached/t/memc243_view.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc243_view.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc244_w_batch_1-master.opt'
--- a/mysql-test/suite/memcached/t/memc244_w_batch_1-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc244_w_batch_1-master.opt	2012-03-06 11:15:53 +0000
@@ -1,5 +1,5 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_w_batch_size=3
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_w_batch_size=3
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11244"

=== modified file 'mysql-test/suite/memcached/t/memc244_w_batch_1.test'
--- a/mysql-test/suite/memcached/t/memc244_w_batch_1.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc244_w_batch_1.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc245_w_batch_2-master.opt'
--- a/mysql-test/suite/memcached/t/memc245_w_batch_2-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc245_w_batch_2-master.opt	2012-03-06 11:15:53 +0000
@@ -1,5 +1,5 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_w_batch_size=-1
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_w_batch_size=-1
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11245"

=== modified file 'mysql-test/suite/memcached/t/memc245_w_batch_2.test'
--- a/mysql-test/suite/memcached/t/memc245_w_batch_2.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc245_w_batch_2.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

=== modified file 'mysql-test/suite/memcached/t/memc246_w_batch_3-master.opt'
--- a/mysql-test/suite/memcached/t/memc246_w_batch_3-master.opt	2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc246_w_batch_3-master.opt	2012-03-06 11:15:53 +0000
@@ -1,5 +1,5 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
---daemon_memcached_r_batch_size=1
---daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_r_batch_size=1
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11246"

=== modified file 'mysql-test/suite/memcached/t/memc246_w_batch_3.test'
--- a/mysql-test/suite/memcached/t/memc246_w_batch_3.test	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/t/memc246_w_batch_3.test	2012-03-06 11:15:53 +0000
@@ -4,13 +4,13 @@ CALL mtr.add_suppression("Could not obta
 CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
 --enable_query_log
 
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
 --enable_connect_log
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-source include/not_windows.inc;
-source include/have_innodb.inc;
-
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-wl5824 branch (horst.hunger:3840 to 3841) WL#5824horst.hunger8 Mar