List:Commits« Previous MessageNext Message »
From:horst.hunger Date:May 24 2012 12:59pm
Subject:bzr push into mysql-trunk-wl6218 branch (horst.hunger:3870 to 3871)
View as plain text  
 3871 horst.hunger@stripped	2012-05-24
      Activated the memcached.so check and load by mtr.

    modified:
      mysql-test/suite/memcached/r/memc272_2_tables.result
      mysql-test/suite/memcached/r/memc273_5_tables.result
      mysql-test/suite/memcached/r/memc274_5_tables_uml.result
      mysql-test/suite/memcached/r/memc275_5_tables_index.result
      mysql-test/suite/memcached/r/memc276_1_table.result
      mysql-test/suite/memcached/r/memc277_default_table.result
      mysql-test/suite/memcached/r/memc278_view.result
      mysql-test/suite/memcached/t/memc272_2_tables-master.opt
      mysql-test/suite/memcached/t/memc272_2_tables.test
      mysql-test/suite/memcached/t/memc273_5_tables-master.opt
      mysql-test/suite/memcached/t/memc273_5_tables.test
      mysql-test/suite/memcached/t/memc274_5_tables_uml-master.opt
      mysql-test/suite/memcached/t/memc274_5_tables_uml.test
      mysql-test/suite/memcached/t/memc275_5_tables_index-master.opt
      mysql-test/suite/memcached/t/memc275_5_tables_index.test
      mysql-test/suite/memcached/t/memc276_1_table-master.opt
      mysql-test/suite/memcached/t/memc276_1_table.test
      mysql-test/suite/memcached/t/memc277_default_table-master.opt
      mysql-test/suite/memcached/t/memc277_default_table.test
      mysql-test/suite/memcached/t/memc278_view-master.opt
      mysql-test/suite/memcached/t/memc278_view.test
 3870 Jimmy Yang	2012-05-24
      Adjust some index related test and their result. Mostly are still there
      must be index on the key column.

    modified:
      mysql-test/suite/memcached/r/memc224_index_2.result
      mysql-test/suite/memcached/r/memc225_index_3.result
      mysql-test/suite/memcached/r/memc275_5_tables_index.result
      mysql-test/suite/memcached/t/memc224_index_2.test
      mysql-test/suite/memcached/t/memc275_5_tables_index.test
=== modified file 'mysql-test/suite/memcached/r/memc272_2_tables.result'
--- a/mysql-test/suite/memcached/r/memc272_2_tables.result	2012-05-23 17:55:09 +0000
+++ b/mysql-test/suite/memcached/r/memc272_2_tables.result	2012-05-24 12:57:53 +0000
@@ -1,5 +1,6 @@
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+UNINSTALL PLUGIN daemon_memcached;
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 "innodb_only", "innodb_only", "innodb_only");
 INSERT INTO config_options VALUES("separator", "|");
@@ -205,5 +206,4 @@ F	NULL	Sachsenhausen
 H	0	Norderstedt
 DROP TABLE t1,t2;
 DROP DATABASE innodb_memcache;
-UNINSTALL PLUGIN daemon_memcached;
 SET @@global.tx_isolation= @tx_isolation;

=== modified file 'mysql-test/suite/memcached/r/memc273_5_tables.result'
--- a/mysql-test/suite/memcached/r/memc273_5_tables.result	2012-05-23 17:55:09 +0000
+++ b/mysql-test/suite/memcached/r/memc273_5_tables.result	2012-05-24 12:57:53 +0000
@@ -1,5 +1,6 @@
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+UNINSTALL PLUGIN daemon_memcached;
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 "innodb_only", "innodb_only", "innodb_only");
 INSERT INTO config_options VALUES("separator", "|");
@@ -208,5 +209,4 @@ O	Oldenburg	Mitte	87654	Deich
 S	Stuttgart	Nord	65432	Fernsehturm
 DROP TABLE t1,t2,t3,t4,t5;
 DROP DATABASE innodb_memcache;
-UNINSTALL PLUGIN daemon_memcached;
 SET @@global.tx_isolation= @tx_isolation;

=== modified file 'mysql-test/suite/memcached/r/memc274_5_tables_uml.result'
--- a/mysql-test/suite/memcached/r/memc274_5_tables_uml.result	2012-05-22 11:05:32 +0000
+++ b/mysql-test/suite/memcached/r/memc274_5_tables_uml.result	2012-05-24 12:57:53 +0000
@@ -1,5 +1,6 @@
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+UNINSTALL PLUGIN daemon_memcached;
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 "innodb_only", "innodb_only", "innodb_only");
 INSERT INTO config_options VALUES("separator", "|");
@@ -205,5 +206,4 @@ O	Oldenburg	Mitte	87654	Bäder
 S	Stuttgart	Nord	65432	Fernsehturm
 DROP TABLE t1,t2,t3,t4,t5;
 DROP DATABASE innodb_memcache;
-UNINSTALL PLUGIN daemon_memcached;
 SET @@global.tx_isolation= @tx_isolation;

=== modified file 'mysql-test/suite/memcached/r/memc275_5_tables_index.result'
--- a/mysql-test/suite/memcached/r/memc275_5_tables_index.result	2012-05-24 09:58:08 +0000
+++ b/mysql-test/suite/memcached/r/memc275_5_tables_index.result	2012-05-24 12:57:53 +0000
@@ -1,5 +1,6 @@
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+UNINSTALL PLUGIN daemon_memcached;
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 "innodb_only", "innodb_only", "innodb_only");
 INSERT INTO config_options VALUES("separator", "|");
@@ -207,5 +208,4 @@ O	Oldenburg	Mitte	87654	Deich
 S	Stuttgart	Nord	65432	Fernsehturm
 DROP TABLE t1,t2,t3,t4,t5;
 DROP DATABASE innodb_memcache;
-UNINSTALL PLUGIN daemon_memcached;
 SET @@global.tx_isolation= @tx_isolation;

=== modified file 'mysql-test/suite/memcached/r/memc276_1_table.result'
--- a/mysql-test/suite/memcached/r/memc276_1_table.result	2012-05-23 17:55:09 +0000
+++ b/mysql-test/suite/memcached/r/memc276_1_table.result	2012-05-24 12:57:53 +0000
@@ -1,5 +1,6 @@
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+UNINSTALL PLUGIN daemon_memcached;
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 "innodb_only", "innodb_only", "innodb_only");
 INSERT INTO config_options VALUES("separator", "|");
@@ -151,5 +152,4 @@ O	Oldenburg	Mitte	87654	Deich	2	B	b	Y
 S	Stuttgart	Nord	65432	Fernsehturm	4	D	d	U
 DROP TABLE t1;
 DROP DATABASE innodb_memcache;
-UNINSTALL PLUGIN daemon_memcached;
 SET @@global.tx_isolation= @tx_isolation;

=== modified file 'mysql-test/suite/memcached/r/memc277_default_table.result'
--- a/mysql-test/suite/memcached/r/memc277_default_table.result	2012-05-23 17:55:09 +0000
+++ b/mysql-test/suite/memcached/r/memc277_default_table.result	2012-05-24 12:57:53 +0000
@@ -1,5 +1,6 @@
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+UNINSTALL PLUGIN daemon_memcached;
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 "innodb_only", "innodb_only", "innodb_only");
 INSERT INTO config_options VALUES("separator", "|");
@@ -394,5 +395,4 @@ E	Emden
 H	Hannover
 DROP TABLE t1,t2,t3,t4,t5;
 DROP DATABASE innodb_memcache;
-UNINSTALL PLUGIN daemon_memcached;
 SET @@global.tx_isolation= @tx_isolation;

=== modified file 'mysql-test/suite/memcached/r/memc278_view.result'
--- a/mysql-test/suite/memcached/r/memc278_view.result	2012-05-23 17:55:09 +0000
+++ b/mysql-test/suite/memcached/r/memc278_view.result	2012-05-24 12:57:53 +0000
@@ -1,5 +1,6 @@
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+UNINSTALL PLUGIN daemon_memcached;
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 "innodb_only", "innodb_only", "innodb_only");
 INSERT INTO config_options VALUES("separator", "|");
@@ -231,5 +232,4 @@ S	Stuttgart	Nord	65432	Fernsehturm
 DROP VIEW v1;
 DROP TABLE t1,t2,t3,t4,t5;
 DROP DATABASE innodb_memcache;
-UNINSTALL PLUGIN daemon_memcached;
 SET @@global.tx_isolation= @tx_isolation;

=== modified file 'mysql-test/suite/memcached/t/memc272_2_tables-master.opt'
--- a/mysql-test/suite/memcached/t/memc272_2_tables-master.opt	2012-05-23 17:55:09 +0000
+++ b/mysql-test/suite/memcached/t/memc272_2_tables-master.opt	2012-05-24 12:57:53 +0000
@@ -1,3 +1,4 @@
 $DAEMON_MEMCACHED_OPT
+$DAEMON_MEMCACHED_LOAD
 --loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11272"

=== modified file 'mysql-test/suite/memcached/t/memc272_2_tables.test'
--- a/mysql-test/suite/memcached/t/memc272_2_tables.test	2012-05-23 17:55:09 +0000
+++ b/mysql-test/suite/memcached/t/memc272_2_tables.test	2012-05-24 12:57:53 +0000
@@ -1,4 +1,5 @@
 source include/not_valgrind.inc;
+source include/have_memcached_plugin.inc;
 source include/not_windows.inc;
 source include/have_innodb.inc;
 
@@ -13,7 +14,7 @@ SET @tx_isolation= @@global.tx_isolation
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
 # Stop plugin befor innodb_memcached configuration
-#UNINSTALL PLUGIN daemon_memcached;
+UNINSTALL PLUGIN daemon_memcached;
 
 # Create the memcached tables
 --disable_query_log
@@ -303,5 +304,4 @@ SELECT c1,c2,c21 FROM t1;
 DROP TABLE t1,t2;
 DROP DATABASE innodb_memcache;
 
-UNINSTALL PLUGIN daemon_memcached;
 SET @@global.tx_isolation= @tx_isolation;

=== modified file 'mysql-test/suite/memcached/t/memc273_5_tables-master.opt'
--- a/mysql-test/suite/memcached/t/memc273_5_tables-master.opt	2012-05-23 17:55:09 +0000
+++ b/mysql-test/suite/memcached/t/memc273_5_tables-master.opt	2012-05-24 12:57:53 +0000
@@ -1,3 +1,4 @@
 $DAEMON_MEMCACHED_OPT
+$DAEMON_MEMCACHED_LOAD
 --loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11273"

=== modified file 'mysql-test/suite/memcached/t/memc273_5_tables.test'
--- a/mysql-test/suite/memcached/t/memc273_5_tables.test	2012-05-23 17:55:09 +0000
+++ b/mysql-test/suite/memcached/t/memc273_5_tables.test	2012-05-24 12:57:53 +0000
@@ -1,4 +1,5 @@
 source include/not_valgrind.inc;
+source include/have_memcached_plugin.inc;
 source include/not_windows.inc;
 source include/have_innodb.inc;
 
@@ -12,6 +13,9 @@ CALL mtr.add_suppression("InnoDB: Warnin
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
+# Stop plugin befor innodb_memcached configuration
+UNINSTALL PLUGIN daemon_memcached;
+
 # Create the memcached tables
 --disable_query_log
 source suite/memcached/inc/memcache_config.inc;
@@ -262,5 +266,4 @@ SELECT c1,c2,c21,c22,c23 FROM t5;
 DROP TABLE t1,t2,t3,t4,t5;
 DROP DATABASE innodb_memcache;
  
-UNINSTALL PLUGIN daemon_memcached;
 SET @@global.tx_isolation= @tx_isolation;

=== modified file 'mysql-test/suite/memcached/t/memc274_5_tables_uml-master.opt'
--- a/mysql-test/suite/memcached/t/memc274_5_tables_uml-master.opt	2012-05-22 10:09:43 +0000
+++ b/mysql-test/suite/memcached/t/memc274_5_tables_uml-master.opt	2012-05-24 12:57:53 +0000
@@ -1,3 +1,4 @@
 $DAEMON_MEMCACHED_OPT
+$DAEMON_MEMCACHED_LOAD
 --loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11274"

=== modified file 'mysql-test/suite/memcached/t/memc274_5_tables_uml.test'
--- a/mysql-test/suite/memcached/t/memc274_5_tables_uml.test	2012-05-22 10:09:43 +0000
+++ b/mysql-test/suite/memcached/t/memc274_5_tables_uml.test	2012-05-24 12:57:53 +0000
@@ -1,4 +1,5 @@
 source include/not_valgrind.inc;
+source include/have_memcached_plugin.inc;
 source include/not_windows.inc;
 source include/have_innodb.inc;
 
@@ -12,6 +13,9 @@ CALL mtr.add_suppression("InnoDB: Warnin
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
+# Stop plugin befor innodb_memcached configuration
+UNINSTALL PLUGIN daemon_memcached;
+
 # Create the memcached tables
 --disable_query_log
 source suite/memcached/inc/memcache_config.inc;
@@ -262,5 +266,4 @@ SELECT c1,c2,c21,c22,c23 FROM t5;
 DROP TABLE t1,t2,t3,t4,t5;
 DROP DATABASE innodb_memcache;
  
-UNINSTALL PLUGIN daemon_memcached;
 SET @@global.tx_isolation= @tx_isolation;

=== modified file 'mysql-test/suite/memcached/t/memc275_5_tables_index-master.opt'
--- a/mysql-test/suite/memcached/t/memc275_5_tables_index-master.opt	2012-05-23 17:55:09 +0000
+++ b/mysql-test/suite/memcached/t/memc275_5_tables_index-master.opt	2012-05-24 12:57:53 +0000
@@ -1,3 +1,4 @@
 $DAEMON_MEMCACHED_OPT
+$DAEMON_MEMCACHED_LOAD
 --loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11275"

=== modified file 'mysql-test/suite/memcached/t/memc275_5_tables_index.test'
--- a/mysql-test/suite/memcached/t/memc275_5_tables_index.test	2012-05-24 09:58:08 +0000
+++ b/mysql-test/suite/memcached/t/memc275_5_tables_index.test	2012-05-24 12:57:53 +0000
@@ -1,4 +1,5 @@
 source include/not_valgrind.inc;
+source include/have_memcached_plugin.inc;
 source include/not_windows.inc;
 source include/have_innodb.inc;
 
@@ -12,6 +13,9 @@ CALL mtr.add_suppression("InnoDB: Warnin
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
+# Stop plugin befor innodb_memcached configuration
+UNINSTALL PLUGIN daemon_memcached;
+
 # Create the memcached tables
 --disable_query_log
 source suite/memcached/inc/memcache_config.inc;
@@ -267,5 +271,4 @@ SELECT c1,c2,c21,c22,c23 FROM t5;
 DROP TABLE t1,t2,t3,t4,t5;
 DROP DATABASE innodb_memcache;
  
-UNINSTALL PLUGIN daemon_memcached;
 SET @@global.tx_isolation= @tx_isolation;

=== modified file 'mysql-test/suite/memcached/t/memc276_1_table-master.opt'
--- a/mysql-test/suite/memcached/t/memc276_1_table-master.opt	2012-05-23 08:39:40 +0000
+++ b/mysql-test/suite/memcached/t/memc276_1_table-master.opt	2012-05-24 12:57:53 +0000
@@ -1,3 +1,4 @@
 $DAEMON_MEMCACHED_OPT
+$DAEMON_MEMCACHED_LOAD
 --loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11276"

=== modified file 'mysql-test/suite/memcached/t/memc276_1_table.test'
--- a/mysql-test/suite/memcached/t/memc276_1_table.test	2012-05-23 17:55:09 +0000
+++ b/mysql-test/suite/memcached/t/memc276_1_table.test	2012-05-24 12:57:53 +0000
@@ -1,4 +1,5 @@
 source include/not_valgrind.inc;
+source include/have_memcached_plugin.inc;
 source include/not_windows.inc;
 source include/have_innodb.inc;
 
@@ -12,6 +13,9 @@ CALL mtr.add_suppression("InnoDB: Warnin
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
+# Stop plugin befor innodb_memcached configuration
+UNINSTALL PLUGIN daemon_memcached;
+
 # Create the memcached tables
 --disable_query_log
 source suite/memcached/inc/memcache_config.inc;
@@ -287,5 +291,4 @@ SELECT c1,c2,c21,c22,c23,c24,c25,c26,c27
 DROP TABLE t1;
 DROP DATABASE innodb_memcache;
  
-UNINSTALL PLUGIN daemon_memcached;
 SET @@global.tx_isolation= @tx_isolation;

=== modified file 'mysql-test/suite/memcached/t/memc277_default_table-master.opt'
--- a/mysql-test/suite/memcached/t/memc277_default_table-master.opt	2012-05-23 17:55:09 +0000
+++ b/mysql-test/suite/memcached/t/memc277_default_table-master.opt	2012-05-24 12:57:53 +0000
@@ -1,3 +1,4 @@
 $DAEMON_MEMCACHED_OPT
+$DAEMON_MEMCACHED_LOAD
 --loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11277"

=== modified file 'mysql-test/suite/memcached/t/memc277_default_table.test'
--- a/mysql-test/suite/memcached/t/memc277_default_table.test	2012-05-23 17:55:09 +0000
+++ b/mysql-test/suite/memcached/t/memc277_default_table.test	2012-05-24 12:57:53 +0000
@@ -1,4 +1,5 @@
 source include/not_valgrind.inc;
+source include/have_memcached_plugin.inc;
 source include/not_windows.inc;
 source include/have_innodb.inc;
 
@@ -12,6 +13,9 @@ CALL mtr.add_suppression("InnoDB: Warnin
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
+# Stop plugin befor innodb_memcached configuration
+UNINSTALL PLUGIN daemon_memcached;
+
 # Create the memcached tables
 --disable_query_log
 source suite/memcached/inc/memcache_config.inc;
@@ -399,5 +403,4 @@ SELECT c1,c2 FROM t2;
 DROP TABLE t1,t2,t3,t4,t5;
 DROP DATABASE innodb_memcache;
  
-UNINSTALL PLUGIN daemon_memcached;
 SET @@global.tx_isolation= @tx_isolation;

=== modified file 'mysql-test/suite/memcached/t/memc278_view-master.opt'
--- a/mysql-test/suite/memcached/t/memc278_view-master.opt	2012-05-23 17:55:09 +0000
+++ b/mysql-test/suite/memcached/t/memc278_view-master.opt	2012-05-24 12:57:53 +0000
@@ -1,3 +1,4 @@
 $DAEMON_MEMCACHED_OPT
+$DAEMON_MEMCACHED_LOAD
 --loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --loose-daemon_memcached_option="-p11278"

=== modified file 'mysql-test/suite/memcached/t/memc278_view.test'
--- a/mysql-test/suite/memcached/t/memc278_view.test	2012-05-23 17:55:09 +0000
+++ b/mysql-test/suite/memcached/t/memc278_view.test	2012-05-24 12:57:53 +0000
@@ -1,4 +1,5 @@
 source include/not_valgrind.inc;
+source include/have_memcached_plugin.inc;
 source include/not_windows.inc;
 source include/have_innodb.inc;
 
@@ -12,6 +13,9 @@ CALL mtr.add_suppression("InnoDB: Warnin
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
+# Stop plugin befor innodb_memcached configuration
+UNINSTALL PLUGIN daemon_memcached;
+
 # Create the memcached tables
 --disable_query_log
 source suite/memcached/inc/memcache_config.inc;
@@ -312,5 +316,4 @@ DROP VIEW v1;
 DROP TABLE t1,t2,t3,t4,t5;
 DROP DATABASE innodb_memcache;
  
-UNINSTALL PLUGIN daemon_memcached;
 SET @@global.tx_isolation= @tx_isolation;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-wl6218 branch (horst.hunger:3870 to 3871) horst.hunger24 May