3870 horst.hunger@stripped 2012-05-24
For code coverage.
modified:
mysql-test/suite/memcached/r/memc224_index_2.result
mysql-test/suite/memcached/r/memc225_index_3.result
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
3869 horst.hunger@stripped 2012-05-23
For gcov run.
removed:
mysql-test/suite/memcached/r/memc272_5_tables.result
mysql-test/suite/memcached/t/memc272_5_tables-master.opt
mysql-test/suite/memcached/t/memc272_5_tables.test
added:
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/memc220_fkey_1.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/r/memc247_cache_policy.result
mysql-test/suite/memcached/r/memc248_fkey_2.result
mysql-test/suite/memcached/r/memc250_container.result
mysql-test/suite/memcached/r/memc251_w_batch_6.result
mysql-test/suite/memcached/r/memc261_container_errs.result
mysql-test/suite/memcached/r/memc263_r_batch_4.result
mysql-test/suite/memcached/r/memc265_r_batch_5.result
mysql-test/suite/memcached/r/memc266_w_batch_4.result
mysql-test/suite/memcached/r/memc267_w_batch_5.result
mysql-test/suite/memcached/r/memc268_w_batch_7.result
mysql-test/suite/memcached/r/memc269_funcs_1.result
mysql-test/suite/memcached/r/memc272_2_tables.result
mysql-test/suite/memcached/r/memc273_5_tables.result
mysql-test/suite/memcached/r/memc275_5_tables_index.result
mysql-test/suite/memcached/r/memc277_default_table.result
mysql-test/suite/memcached/r/memc278_view.result
mysql-test/suite/memcached/r/rpl_memc270_1.result
mysql-test/suite/memcached/r/rpl_memc271_2.result
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
mysql-test/suite/memcached/t/memc247_cache_policy-master.opt
mysql-test/suite/memcached/t/memc247_cache_policy.test
mysql-test/suite/memcached/t/memc248_fkey_2-master.opt
mysql-test/suite/memcached/t/memc248_fkey_2.test
mysql-test/suite/memcached/t/memc250_container-master.opt
mysql-test/suite/memcached/t/memc250_container.test
mysql-test/suite/memcached/t/memc251_w_batch_6-master.opt
mysql-test/suite/memcached/t/memc251_w_batch_6.test
mysql-test/suite/memcached/t/memc261_container_errs-master.opt
mysql-test/suite/memcached/t/memc261_container_errs.test
mysql-test/suite/memcached/t/memc263_r_batch_4-master.opt
mysql-test/suite/memcached/t/memc263_r_batch_4.test
mysql-test/suite/memcached/t/memc265_r_batch_5-master.opt
mysql-test/suite/memcached/t/memc265_r_batch_5.test
mysql-test/suite/memcached/t/memc266_w_batch_4-master.opt
mysql-test/suite/memcached/t/memc266_w_batch_4.test
mysql-test/suite/memcached/t/memc267_w_batch_5-master.opt
mysql-test/suite/memcached/t/memc267_w_batch_5.test
mysql-test/suite/memcached/t/memc268_w_batch_7-master.opt
mysql-test/suite/memcached/t/memc268_w_batch_7.test
mysql-test/suite/memcached/t/memc269_funcs_1-master.opt
mysql-test/suite/memcached/t/memc269_funcs_1.test
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/memc275_5_tables_index-master.opt
mysql-test/suite/memcached/t/memc275_5_tables_index.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
mysql-test/suite/memcached/t/rpl_memc270_1-master.opt
mysql-test/suite/memcached/t/rpl_memc270_1-slave.opt
mysql-test/suite/memcached/t/rpl_memc270_1.test
mysql-test/suite/memcached/t/rpl_memc271_2-master.opt
mysql-test/suite/memcached/t/rpl_memc271_2-slave.opt
mysql-test/suite/memcached/t/rpl_memc271_2.test
modified:
mysql-test/suite/memcached/r/memc276_1_table.result
mysql-test/suite/memcached/t/memc276_1_table.test
=== modified file 'mysql-test/suite/memcached/r/memc224_index_2.result'
--- a/mysql-test/suite/memcached/r/memc224_index_2.result 2012-05-23 17:55:09 +0000
+++ b/mysql-test/suite/memcached/r/memc224_index_2.result 2012-05-24 09:10:25 +0000
@@ -135,6 +135,7 @@ t1 CREATE TABLE `t1` (
) ENGINE=InnoDB DEFAULT CHARSET=latin1
connection mysqltest1;
Here the memcached results after set:
+Hamburg|Norderstedt
SELECT c1,c11,c2,c21 FROM t1;
c1 c11 c2 c21
B B Berlin Mitte
=== modified file 'mysql-test/suite/memcached/r/memc225_index_3.result'
--- a/mysql-test/suite/memcached/r/memc225_index_3.result 2012-05-23 17:55:09 +0000
+++ b/mysql-test/suite/memcached/r/memc225_index_3.result 2012-05-24 09:10:25 +0000
@@ -43,6 +43,10 @@ C Cc Cottbus West
D Dd Darmstadt City
H Hh Hamburg Norderstedt
Here the memcached results with D,B,H,C:
+Darmstadt|City
+Berlin|Mitte
+Hamburg|Norderstedt
+Cottbus|West
SELECT c1,c11,c2,c21 FROM t1;
c1 c11 c2 c21
B Bb Berlin Mitte
@@ -122,6 +126,7 @@ t1 CREATE TABLE `t1` (
) ENGINE=InnoDB DEFAULT CHARSET=latin1
connection mysqltest1;
Here the memcached results after set:
+Hamburg|Norderstedt
SELECT c1,c11,c2,c21 FROM t1;
c1 c11 c2 c21
B Bb Berlin Mitte
=== 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 09:10:25 +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 09:10:25 +0000
@@ -1,5 +1,10 @@
+select * FROM INFORMATION_SCHEMA.PLUGINS
+WHERE PLUGIN_NAME='daemon_memcached';
+PLUGIN_NAME PLUGIN_VERSION PLUGIN_STATUS PLUGIN_TYPE PLUGIN_TYPE_VERSION PLUGIN_LIBRARY PLUGIN_LIBRARY_VERSION PLUGIN_AUTHOR PLUGIN_DESCRIPTION PLUGIN_LICENSE LOAD_OPTION
+daemon_memcached 1.0 ACTIVE DAEMON 50606.0 libmemcached.so 1.3 Oracle Corporation Memcached Daemon GPL ON
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 +213,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 09:10:25 +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-23 17:55:09 +0000
+++ b/mysql-test/suite/memcached/r/memc275_5_tables_index.result 2012-05-24 09:10:25 +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", "|");
@@ -108,15 +109,7 @@ Berlin|Mitte
Hamburg|Norderstedt
Cottbus|West
Here the memcached results with D,B,H,C of t2:
-Do|Dortmund
-Br|Bremen
-Ha|Hannover
-Ce|Celle
Here the memcached results with D,B,H,A of t3:
-Detmold|City
-Aachen|West
-Bonn|Mitte
-Hameln|Nord
Here the memcached results with D,O,K,S of t5:
Duesseldorf|City|98765|Hafen
Oldenburg|Mitte|87654|Deich
@@ -128,6 +121,8 @@ Brandenburg|Mitte|23456
Husum|Nord|45678
Muenchen|West|34567
Here the memcached results with D,B,H,C of t2:
+Brandenburg|Mitte|23456
+Husum|Nord|45678
SELECT c1,c2,c21 FROM t1;
c1 c2 c21
B Berlin Mitte
@@ -161,11 +156,9 @@ S Stuttgart Nord 65432 Fernsehturm
Here the memcached results after set in default:
Essen|Ost
Here the memcached results after set in t2:
-Es|Essen
Here the memcached results after set in t5:
Essen|Mitte|111111|Mahlzeit
Here the memcached results after set in t3:
-Essen|Ost
Here the memcached results after set in t4:
Essen|Mitte|111111
Here the memcached results after set in t5:
@@ -182,14 +175,12 @@ c1 c2
B Bremen
C Celle
D Dortmund
-E Essen
H Hannover
SELECT c1,c2,c21 FROM t3;
c1 c2 c21
A Aachen West
B Bonn Mitte
D Detmold City
-E Essen Ost
H Hameln Nord
SELECT c1,c2,c21,c22 FROM t4;
c1 c2 c21 c22
@@ -207,5 +198,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 09:10:25 +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 09:10:25 +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 09:10:25 +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 09:10:25 +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 09:10:25 +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 09:10:25 +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 09:10:25 +0000
@@ -1,6 +1,9 @@
source include/not_valgrind.inc;
+source include/have_memcached_plugin.inc;
source include/not_windows.inc;
source include/have_innodb.inc;
+select * FROM INFORMATION_SCHEMA.PLUGINS
+ WHERE PLUGIN_NAME='daemon_memcached';
--disable_query_log
CALL mtr.add_suppression("daemon-memcached-w-batch-size': unsigned");
@@ -12,6 +15,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 +268,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 09:10:25 +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 09:10:25 +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 09:10:25 +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-23 17:55:09 +0000
+++ b/mysql-test/suite/memcached/t/memc275_5_tables_index.test 2012-05-24 09:10:25 +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 09:10:25 +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 09:10:25 +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 09:10:25 +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 09:10:25 +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 09:10:25 +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 09:10:25 +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:3869 to 3870) | horst.hunger | 24 May |
