List:Commits« Previous MessageNext Message »
From:horst.hunger Date:February 20 2012 4:29pm
Subject:bzr push into mysql-trunk-wl5824 branch (horst.hunger:3809 to 3810) WL#5824
View as plain text  
 3810 horst.hunger@stripped	2012-02-20
      WL#5824: More and modified tests

    added:
      mysql-test/suite/memcached/r/memcached_5_utf8.result
      mysql-test/suite/memcached/r/memcached_NULL_cols.result
      mysql-test/suite/memcached/r/memcached_lock.result
      mysql-test/suite/memcached/r/memcached_mdl.result
      mysql-test/suite/memcached/r/memcached_sep_4.result
      mysql-test/suite/memcached/t/memcached_5_utf8-master.opt
      mysql-test/suite/memcached/t/memcached_5_utf8.test
      mysql-test/suite/memcached/t/memcached_NULL_cols-master.opt
      mysql-test/suite/memcached/t/memcached_NULL_cols.test
      mysql-test/suite/memcached/t/memcached_lock-master.opt
      mysql-test/suite/memcached/t/memcached_lock.test
      mysql-test/suite/memcached/t/memcached_mdl-master.opt
      mysql-test/suite/memcached/t/memcached_mdl.test
      mysql-test/suite/memcached/t/memcached_sep_4-master.opt
      mysql-test/suite/memcached/t/memcached_sep_4.test
    modified:
      mysql-test/include/plugin.defs
      mysql-test/suite/memcached/r/memcached_2_cols.result
      mysql-test/suite/memcached/r/memcached_2_intcols.result
      mysql-test/suite/memcached/r/memcached_5_cols.result
      mysql-test/suite/memcached/r/memcached_add.result
      mysql-test/suite/memcached/r/memcached_decr.result
      mysql-test/suite/memcached/r/memcached_delete.result
      mysql-test/suite/memcached/r/memcached_get.result
      mysql-test/suite/memcached/r/memcached_incr.result
      mysql-test/suite/memcached/r/memcached_replace.result
      mysql-test/suite/memcached/r/memcached_sep_1.result
      mysql-test/suite/memcached/r/memcached_sep_2.result
      mysql-test/suite/memcached/r/memcached_sep_3.result
      mysql-test/suite/memcached/r/memcached_set.result
      mysql-test/suite/memcached/t/memcached_2_cols-master.opt
      mysql-test/suite/memcached/t/memcached_2_cols.test
      mysql-test/suite/memcached/t/memcached_2_intcols-master.opt
      mysql-test/suite/memcached/t/memcached_2_intcols.test
      mysql-test/suite/memcached/t/memcached_50_cols-master.opt
      mysql-test/suite/memcached/t/memcached_5_cols-master.opt
      mysql-test/suite/memcached/t/memcached_5_cols.test
      mysql-test/suite/memcached/t/memcached_add-master.opt
      mysql-test/suite/memcached/t/memcached_add.test
      mysql-test/suite/memcached/t/memcached_decr-master.opt
      mysql-test/suite/memcached/t/memcached_decr.test
      mysql-test/suite/memcached/t/memcached_delete-master.opt
      mysql-test/suite/memcached/t/memcached_delete.test
      mysql-test/suite/memcached/t/memcached_get-master.opt
      mysql-test/suite/memcached/t/memcached_get.test
      mysql-test/suite/memcached/t/memcached_incr-master.opt
      mysql-test/suite/memcached/t/memcached_incr.test
      mysql-test/suite/memcached/t/memcached_replace-master.opt
      mysql-test/suite/memcached/t/memcached_replace.test
      mysql-test/suite/memcached/t/memcached_sep_1-master.opt
      mysql-test/suite/memcached/t/memcached_sep_1.test
      mysql-test/suite/memcached/t/memcached_sep_2-master.opt
      mysql-test/suite/memcached/t/memcached_sep_2.test
      mysql-test/suite/memcached/t/memcached_sep_3-master.opt
      mysql-test/suite/memcached/t/memcached_sep_3.test
      mysql-test/suite/memcached/t/memcached_set-master.opt
      mysql-test/suite/memcached/t/memcached_set.test
 3809 horst.hunger@stripped	2012-02-20
      wl5824:Modified test.

    modified:
      mysql-test/suite/memcached/r/memcached_50_cols.result
      mysql-test/suite/memcached/t/memcached_50_cols.test
=== modified file 'mysql-test/include/plugin.defs'
--- a/mysql-test/include/plugin.defs	2012-02-07 13:20:25 +0000
+++ b/mysql-test/include/plugin.defs	2012-02-20 16:29:18 +0000
@@ -43,3 +43,4 @@ mypluglib          plugin/fulltext    SI
 adt_null           plugin/audit_null  AUDIT_NULL
 libdaemon_example  plugin/daemon_example DAEMONEXAMPLE
 libmemcached       plugin/innodb_memcached/daemon_memcached DAEMON_MEMCACHED daemon_memcached
+innodb_engine      plugin/innodb_memcached/innodb_memcache INNODB_ENGINE

=== modified file 'mysql-test/suite/memcached/r/memcached_2_cols.result'
--- a/mysql-test/suite/memcached/r/memcached_2_cols.result	2012-02-20 10:12:50 +0000
+++ b/mysql-test/suite/memcached/r/memcached_2_cols.result	2012-02-20 16:29:18 +0000
@@ -4,33 +4,6 @@ CALL mtr.add_suppression("InnoDB: Warnin
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 UNINSTALL PLUGIN daemon_memcached;
-create database innodb_memcache;
-use innodb_memcache;
-CREATE  TABLE IF NOT EXISTS `cache_policies` (
-`policy_name` VARCHAR(40) PRIMARY KEY,
-`get_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL ,
-`set_policy` ENUM('innodb_only', 'cache_only','caching','disabled')
-NOT NULL ,
-`delete_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL,
-`flush_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL
-) ENGINE = innodb;
-CREATE  TABLE IF NOT EXISTS `containers` (
-`name` varchar(50) not null primary key,
-`db_schema` VARCHAR(250) NOT NULL,
-`db_table` VARCHAR(250) NOT NULL,
-`key_columns` VARCHAR(250) NOT NULL,
-`value_columns` VARCHAR(250),
-`flags` VARCHAR(250) NOT NULL DEFAULT "0",
-`cas_column` VARCHAR(250),
-`expire_time_column` VARCHAR(250),
-`unique_idx_name_on_key` VARCHAR(250) NOT NULL
-) ENGINE = InnoDB;
-CREATE  TABLE IF NOT EXISTS `config_options` (
-`name` varchar(50) not null primary key,
-`value` varchar(50)) ENGINE = InnoDB;
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 "innodb_only", "innodb_only", "innodb_only");
 INSERT INTO config_options VALUES("separator", "|");
@@ -102,9 +75,9 @@ D	Darmstadt	City
 E	Essen	Ost
 H	Hamburg	Norderstedt
 Here the memcached results after add Frankfurt|:
-Frankfurt|
+Frankfurt
 Here the memcached results after add |Airport:
-Frankfurt|
+Frankfurt
 SELECT c1,c2,c21 FROM t1;
 c1	c2	c21
 B	Berlin	Mitte
@@ -114,9 +87,9 @@ E	Essen	Ost
 F	Frankfurt	NULL
 H	Hamburg	Norderstedt
 Here the memcached results after replace Frankfurt a.M.:
-Frankfurt a. M.|
+Frankfurt a. M.
 Here the memcached results after replace Sachsenhausen:
-|Sachsenhausen
+Sachsenhausen
 SELECT c1,c2,c21 FROM t1;
 c1	c2	c21
 B	Berlin	Mitte

=== modified file 'mysql-test/suite/memcached/r/memcached_2_intcols.result'
--- a/mysql-test/suite/memcached/r/memcached_2_intcols.result	2012-02-16 08:35:09 +0000
+++ b/mysql-test/suite/memcached/r/memcached_2_intcols.result	2012-02-20 16:29:18 +0000
@@ -4,33 +4,6 @@ CALL mtr.add_suppression("InnoDB: Warnin
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 UNINSTALL PLUGIN daemon_memcached;
-create database innodb_memcache;
-use innodb_memcache;
-CREATE  TABLE IF NOT EXISTS `cache_policies` (
-`policy_name` VARCHAR(40) PRIMARY KEY,
-`get_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL ,
-`set_policy` ENUM('innodb_only', 'cache_only','caching','disabled')
-NOT NULL ,
-`delete_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL,
-`flush_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL
-) ENGINE = innodb;
-CREATE  TABLE IF NOT EXISTS `containers` (
-`name` varchar(50) not null primary key,
-`db_schema` VARCHAR(250) NOT NULL,
-`db_table` VARCHAR(250) NOT NULL,
-`key_columns` VARCHAR(250) NOT NULL,
-`value_columns` VARCHAR(250),
-`flags` VARCHAR(250) NOT NULL DEFAULT "0",
-`cas_column` VARCHAR(250),
-`expire_time_column` VARCHAR(250),
-`unique_idx_name_on_key` VARCHAR(250) NOT NULL
-) ENGINE = InnoDB;
-CREATE  TABLE IF NOT EXISTS `config_options` (
-`name` varchar(50) not null primary key,
-`value` varchar(50)) ENGINE = InnoDB;
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 "innodb_only", "innodb_only", "innodb_only");
 INSERT INTO config_options VALUES("separator", "|");

=== modified file 'mysql-test/suite/memcached/r/memcached_5_cols.result'
--- a/mysql-test/suite/memcached/r/memcached_5_cols.result	2012-02-16 08:35:09 +0000
+++ b/mysql-test/suite/memcached/r/memcached_5_cols.result	2012-02-20 16:29:18 +0000
@@ -4,33 +4,6 @@ CALL mtr.add_suppression("InnoDB: Warnin
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 UNINSTALL PLUGIN daemon_memcached;
-create database innodb_memcache;
-use innodb_memcache;
-CREATE  TABLE IF NOT EXISTS `cache_policies` (
-`policy_name` VARCHAR(40) PRIMARY KEY,
-`get_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL ,
-`set_policy` ENUM('innodb_only', 'cache_only','caching','disabled')
-NOT NULL ,
-`delete_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL,
-`flush_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL
-) ENGINE = innodb;
-CREATE  TABLE IF NOT EXISTS `containers` (
-`name` varchar(50) not null primary key,
-`db_schema` VARCHAR(250) NOT NULL,
-`db_table` VARCHAR(250) NOT NULL,
-`key_columns` VARCHAR(250) NOT NULL,
-`value_columns` VARCHAR(250),
-`flags` VARCHAR(250) NOT NULL DEFAULT "0",
-`cas_column` VARCHAR(250),
-`expire_time_column` VARCHAR(250),
-`unique_idx_name_on_key` VARCHAR(250) NOT NULL
-) ENGINE = InnoDB;
-CREATE  TABLE IF NOT EXISTS `config_options` (
-`name` varchar(50) not null primary key,
-`value` varchar(50)) ENGINE = InnoDB;
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 "innodb_only", "innodb_only", "innodb_only");
 INSERT INTO config_options VALUES("separator", "|");

=== added file 'mysql-test/suite/memcached/r/memcached_5_utf8.result'
--- a/mysql-test/suite/memcached/r/memcached_5_utf8.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/memcached/r/memcached_5_utf8.result	2012-02-20 16:29:18 +0000
@@ -0,0 +1,64 @@
+CALL mtr.add_suppression("daemon-memcached-w-batch-size': unsigned");
+CALL mtr.add_suppression("Could not obtain server's UPN to be used as target service name");
+CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
+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", "|");
+INSERT INTO containers VALUES ("desc_t1", "test", "t1",
+"c1", "c2,c21,c22,c23,c24,c25", "c3", "c4", "c5", "PRIMARY");
+USE test;
+CREATE TABLE t1        (c1 VARCHAR(32),
+c2 VARCHAR(40),
+c21 VARCHAR(40),
+c22 VARCHAR(40),
+c23 VARCHAR(40),
+c24 VARCHAR(40),
+c25 VARCHAR(40),
+c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
+ENGINE = INNODB DEFAULT CHARSET UTF8;
+INSERT INTO t1 VALUES ('D', 'Darmstadt', 'City','1', 'dddddddddddddd', '1234', '2012', 0, 0, 0);
+INSERT INTO t1 VALUES ('B', 'Berlin', 'Mitte', '2', 'bbbbbbbbbbbbbb', '2345', '2012', 0, 0, 0);
+INSERT INTO t1 VALUES ('C', 'Cottbus', 'West', '3', 'cccccccccccccc', '3456', '2012', 0, 0 ,0);
+INSERT INTO t1 VALUES ('M', 'München', 'Süd', '4', 'ÜÖÄßüöä', '4567', '2012', 0, 0, 0);
+INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` varchar(32) NOT NULL DEFAULT '',
+  `c2` varchar(40) DEFAULT NULL,
+  `c21` varchar(40) DEFAULT NULL,
+  `c22` varchar(40) DEFAULT NULL,
+  `c23` varchar(40) DEFAULT NULL,
+  `c24` varchar(40) DEFAULT NULL,
+  `c25` varchar(40) DEFAULT NULL,
+  `c3` int(11) DEFAULT NULL,
+  `c4` bigint(20) unsigned DEFAULT NULL,
+  `c5` int(11) DEFAULT NULL,
+  PRIMARY KEY (`c1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8
+SELECT c1,c2,c21,c22,c23,c24,c25 FROM t1;
+c1	c2	c21	c22	c23	c24	c25
+B	Berlin	Mitte	2	bbbbbbbbbbbbbb	2345	2012
+C	Cottbus	West	3	cccccccccccccc	3456	2012
+D	Darmstadt	City	1	dddddddddddddd	1234	2012
+M	München	Süd	4	ÜÖÄßüöä	4567	2012
+Here the memcached results with D,B,M,C:
+SELECT c1,c2,c21,c22,c23,c24,c25 FROM t1;
+c1	c2	c21	c22	c23	c24	c25
+B	Berlin	Mitte	2	bbbbbbbbbbbbbb	2345	2012
+C	Cottbus	West	3	cccccccccccccc	3456	2012
+D	Darmstadt	City	1	dddddddddddddd	1234	2012
+M	München	Süd	4	ÜÖÄßüöä	4567	2012
+Here the memcached results after set:
+SELECT c1,c2,c21,c22,c23,c24,c25 FROM t1;
+c1	c2	c21	c22	c23	c24	c25
+B	Berlin	Mitte	2	bbbbbbbbbbbbbb	2345	2012
+C	Cottbus	West	3	cccccccccccccc	3456	2012
+D	Darmstadt	City	1	dddddddddddddd	1234	2012
+M	München	Süd	4	ÜÖÄßüöä	4567	2012
+DROP TABLE t1;
+DROP DATABASE innodb_memcache;
+SET @@global.tx_isolation= @tx_isolation;

=== added file 'mysql-test/suite/memcached/r/memcached_NULL_cols.result'
--- a/mysql-test/suite/memcached/r/memcached_NULL_cols.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/memcached/r/memcached_NULL_cols.result	2012-02-20 16:29:18 +0000
@@ -0,0 +1,84 @@
+CALL mtr.add_suppression("daemon-memcached-w-batch-size': unsigned");
+CALL mtr.add_suppression("Could not obtain server's UPN to be used as target service name");
+CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
+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", "|");
+INSERT INTO containers VALUES ("desc_t1", "test", "t1",
+"c1", "c2,c21,c22,c23,c24,c25", "c3", "c4", "c5", "PRIMARY");
+USE test;
+CREATE TABLE t1        (c1 VARCHAR(32),
+c2 VARCHAR(40),
+c21 VARCHAR(40),
+c22 VARCHAR(40),
+c23 VARCHAR(40),
+c24 VARCHAR(40),
+c25 VARCHAR(40),
+c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
+ENGINE = INNODB;
+INSERT INTO t1 VALUES ('D', 'Darmstadt', NULL,'1', 'dddddddddddddd', '1234', NULL, 0, 0, 0);
+INSERT INTO t1 VALUES ('B', 'Berlin', 'Mitte', NULL, 'bbbbbbbbbbbbbb', '2345', '2012', 0, 0, 0);
+INSERT INTO t1 VALUES ('C', 'Cottbus', 'West', '3', NULL, '3456', '2012', 0, 0 ,0);
+INSERT INTO t1 VALUES ('H', NULL, NULL, NULL, 'hhhhhhhhhh', NULL, NULL, 0, 0, 0);
+INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
+SELECT c1,c2,c21,c22,c23,c24,c25 FROM t1;
+c1	c2	c21	c22	c23	c24	c25
+B	Berlin	Mitte	NULL	bbbbbbbbbbbbbb	2345	2012
+C	Cottbus	West	3	NULL	3456	2012
+D	Darmstadt	NULL	1	dddddddddddddd	1234	NULL
+H	NULL	NULL	NULL	hhhhhhhhhh	NULL	NULL
+Here the memcached results with D,B,H,C:
+Darmstadt|1|dddddddddddddd|1234
+Berlin|Mitte|bbbbbbbbbbbbbb|2345|2012
+hhhhhhhhhh
+Cottbus|West|3|3456|2012
+SELECT c1,c2,c21,c22,c23,c24,c25 FROM t1;
+c1	c2	c21	c22	c23	c24	c25
+B	Berlin	Mitte	NULL	bbbbbbbbbbbbbb	2345	2012
+C	Cottbus	West	3	NULL	3456	2012
+D	Darmstadt	NULL	1	dddddddddddddd	1234	NULL
+H	NULL	NULL	NULL	hhhhhhhhhh	NULL	NULL
+Here the memcached results after set:
+Essen|5678|2012
+SELECT c1,c2,c21,c22,c23,c24,c25 FROM t1;
+c1	c2	c21	c22	c23	c24	c25
+B	Berlin	Mitte	NULL	bbbbbbbbbbbbbb	2345	2012
+C	Cottbus	West	3	NULL	3456	2012
+D	Darmstadt	NULL	1	dddddddddddddd	1234	NULL
+E	Essen	5678	2012	NULL	NULL	NULL
+H	NULL	NULL	NULL	hhhhhhhhhh	NULL	NULL
+Here the memcached results after add:
+Frankfurt|Airport|2012
+SELECT c1,c2,c21,c22,c23,c24,c25 FROM t1;
+c1	c2	c21	c22	c23	c24	c25
+B	Berlin	Mitte	NULL	bbbbbbbbbbbbbb	2345	2012
+C	Cottbus	West	3	NULL	3456	2012
+D	Darmstadt	NULL	1	dddddddddddddd	1234	NULL
+E	Essen	5678	2012	NULL	NULL	NULL
+F	Frankfurt	Airport	2012	NULL	NULL	NULL
+H	NULL	NULL	NULL	hhhhhhhhhh	NULL	NULL
+Here the memcached results after replace:
+Frankfurt a.M.|Sachsenhausen|61|fffff|6789
+SELECT c1,c2,c21,c22,c23,c24,c25 FROM t1;
+c1	c2	c21	c22	c23	c24	c25
+B	Berlin	Mitte	NULL	bbbbbbbbbbbbbb	2345	2012
+C	Cottbus	West	3	NULL	3456	2012
+D	Darmstadt	NULL	1	dddddddddddddd	1234	NULL
+E	Essen	5678	2012	NULL	NULL	NULL
+F	Frankfurt a.M.	Sachsenhausen	61	fffff	6789	NULL
+H	NULL	NULL	NULL	hhhhhhhhhh	NULL	NULL
+Here the memcached results after delete:
+Essen|5678|2012
+SELECT c1,c2,c21,c22,c23,c24,c25 FROM t1;
+c1	c2	c21	c22	c23	c24	c25
+B	Berlin	Mitte	NULL	bbbbbbbbbbbbbb	2345	2012
+C	Cottbus	West	3	NULL	3456	2012
+D	Darmstadt	NULL	1	dddddddddddddd	1234	NULL
+E	Essen	5678	2012	NULL	NULL	NULL
+H	NULL	NULL	NULL	hhhhhhhhhh	NULL	NULL
+DROP TABLE t1;
+DROP DATABASE innodb_memcache;
+SET @@global.tx_isolation= @tx_isolation;

=== modified file 'mysql-test/suite/memcached/r/memcached_add.result'
--- a/mysql-test/suite/memcached/r/memcached_add.result	2012-02-07 13:20:25 +0000
+++ b/mysql-test/suite/memcached/r/memcached_add.result	2012-02-20 16:29:18 +0000
@@ -4,33 +4,6 @@ CALL mtr.add_suppression("InnoDB: Warnin
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 UNINSTALL PLUGIN daemon_memcached;
-create database innodb_memcache;
-use innodb_memcache;
-CREATE  TABLE IF NOT EXISTS `cache_policies` (
-`policy_name` VARCHAR(40) PRIMARY KEY,
-`get_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL ,
-`set_policy` ENUM('innodb_only', 'cache_only','caching','disabled')
-NOT NULL ,
-`delete_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL,
-`flush_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL
-) ENGINE = innodb;
-CREATE  TABLE IF NOT EXISTS `containers` (
-`name` varchar(50) not null primary key,
-`db_schema` VARCHAR(250) NOT NULL,
-`db_table` VARCHAR(250) NOT NULL,
-`key_columns` VARCHAR(250) NOT NULL,
-`value_columns` VARCHAR(250),
-`flags` VARCHAR(250) NOT NULL DEFAULT "0",
-`cas_column` VARCHAR(250),
-`expire_time_column` VARCHAR(250),
-`unique_idx_name_on_key` VARCHAR(250) NOT NULL
-) ENGINE = InnoDB;
-CREATE  TABLE IF NOT EXISTS `config_options` (
-`name` varchar(50) not null primary key,
-`value` varchar(50)) ENGINE = InnoDB;
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 "innodb_only", "innodb_only", "innodb_only");
 INSERT INTO config_options VALUES("separator", "|");

=== modified file 'mysql-test/suite/memcached/r/memcached_decr.result'
--- a/mysql-test/suite/memcached/r/memcached_decr.result	2012-02-07 13:20:25 +0000
+++ b/mysql-test/suite/memcached/r/memcached_decr.result	2012-02-20 16:29:18 +0000
@@ -4,33 +4,6 @@ CALL mtr.add_suppression("InnoDB: Warnin
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 UNINSTALL PLUGIN daemon_memcached;
-create database innodb_memcache;
-use innodb_memcache;
-CREATE  TABLE IF NOT EXISTS `cache_policies` (
-`policy_name` VARCHAR(40) PRIMARY KEY,
-`get_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL ,
-`set_policy` ENUM('innodb_only', 'cache_only','caching','disabled')
-NOT NULL ,
-`delete_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL,
-`flush_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL
-) ENGINE = innodb;
-CREATE  TABLE IF NOT EXISTS `containers` (
-`name` varchar(50) not null primary key,
-`db_schema` VARCHAR(250) NOT NULL,
-`db_table` VARCHAR(250) NOT NULL,
-`key_columns` VARCHAR(250) NOT NULL,
-`value_columns` VARCHAR(250),
-`flags` VARCHAR(250) NOT NULL DEFAULT "0",
-`cas_column` VARCHAR(250),
-`expire_time_column` VARCHAR(250),
-`unique_idx_name_on_key` VARCHAR(250) NOT NULL
-) ENGINE = InnoDB;
-CREATE  TABLE IF NOT EXISTS `config_options` (
-`name` varchar(50) not null primary key,
-`value` varchar(50)) ENGINE = InnoDB;
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 "innodb_only", "innodb_only", "innodb_only");
 INSERT INTO config_options VALUES("separator", "|");

=== modified file 'mysql-test/suite/memcached/r/memcached_delete.result'
--- a/mysql-test/suite/memcached/r/memcached_delete.result	2012-02-07 13:20:25 +0000
+++ b/mysql-test/suite/memcached/r/memcached_delete.result	2012-02-20 16:29:18 +0000
@@ -4,33 +4,6 @@ CALL mtr.add_suppression("InnoDB: Warnin
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 UNINSTALL PLUGIN daemon_memcached;
-create database innodb_memcache;
-use innodb_memcache;
-CREATE  TABLE IF NOT EXISTS `cache_policies` (
-`policy_name` VARCHAR(40) PRIMARY KEY,
-`get_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL ,
-`set_policy` ENUM('innodb_only', 'cache_only','caching','disabled')
-NOT NULL ,
-`delete_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL,
-`flush_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL
-) ENGINE = innodb;
-CREATE  TABLE IF NOT EXISTS `containers` (
-`name` varchar(50) not null primary key,
-`db_schema` VARCHAR(250) NOT NULL,
-`db_table` VARCHAR(250) NOT NULL,
-`key_columns` VARCHAR(250) NOT NULL,
-`value_columns` VARCHAR(250),
-`flags` VARCHAR(250) NOT NULL DEFAULT "0",
-`cas_column` VARCHAR(250),
-`expire_time_column` VARCHAR(250),
-`unique_idx_name_on_key` VARCHAR(250) NOT NULL
-) ENGINE = InnoDB;
-CREATE  TABLE IF NOT EXISTS `config_options` (
-`name` varchar(50) not null primary key,
-`value` varchar(50)) ENGINE = InnoDB;
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 "innodb_only", "innodb_only", "innodb_only");
 INSERT INTO config_options VALUES("separator", "|");

=== modified file 'mysql-test/suite/memcached/r/memcached_get.result'
--- a/mysql-test/suite/memcached/r/memcached_get.result	2012-02-07 13:20:25 +0000
+++ b/mysql-test/suite/memcached/r/memcached_get.result	2012-02-20 16:29:18 +0000
@@ -4,33 +4,6 @@ CALL mtr.add_suppression("InnoDB: Warnin
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 UNINSTALL PLUGIN daemon_memcached;
-create database innodb_memcache;
-use innodb_memcache;
-CREATE  TABLE IF NOT EXISTS `cache_policies` (
-`policy_name` VARCHAR(40) PRIMARY KEY,
-`get_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL ,
-`set_policy` ENUM('innodb_only', 'cache_only','caching','disabled')
-NOT NULL ,
-`delete_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL,
-`flush_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL
-) ENGINE = innodb;
-CREATE  TABLE IF NOT EXISTS `containers` (
-`name` varchar(50) not null primary key,
-`db_schema` VARCHAR(250) NOT NULL,
-`db_table` VARCHAR(250) NOT NULL,
-`key_columns` VARCHAR(250) NOT NULL,
-`value_columns` VARCHAR(250),
-`flags` VARCHAR(250) NOT NULL DEFAULT "0",
-`cas_column` VARCHAR(250),
-`expire_time_column` VARCHAR(250),
-`unique_idx_name_on_key` VARCHAR(250) NOT NULL
-) ENGINE = InnoDB;
-CREATE  TABLE IF NOT EXISTS `config_options` (
-`name` varchar(50) not null primary key,
-`value` varchar(50)) ENGINE = InnoDB;
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 "innodb_only", "innodb_only", "innodb_only");
 INSERT INTO config_options VALUES("separator", "|");

=== modified file 'mysql-test/suite/memcached/r/memcached_incr.result'
--- a/mysql-test/suite/memcached/r/memcached_incr.result	2012-02-07 13:20:25 +0000
+++ b/mysql-test/suite/memcached/r/memcached_incr.result	2012-02-20 16:29:18 +0000
@@ -4,33 +4,6 @@ CALL mtr.add_suppression("InnoDB: Warnin
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 UNINSTALL PLUGIN daemon_memcached;
-create database innodb_memcache;
-use innodb_memcache;
-CREATE  TABLE IF NOT EXISTS `cache_policies` (
-`policy_name` VARCHAR(40) PRIMARY KEY,
-`get_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL ,
-`set_policy` ENUM('innodb_only', 'cache_only','caching','disabled')
-NOT NULL ,
-`delete_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL,
-`flush_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL
-) ENGINE = innodb;
-CREATE  TABLE IF NOT EXISTS `containers` (
-`name` varchar(50) not null primary key,
-`db_schema` VARCHAR(250) NOT NULL,
-`db_table` VARCHAR(250) NOT NULL,
-`key_columns` VARCHAR(250) NOT NULL,
-`value_columns` VARCHAR(250),
-`flags` VARCHAR(250) NOT NULL DEFAULT "0",
-`cas_column` VARCHAR(250),
-`expire_time_column` VARCHAR(250),
-`unique_idx_name_on_key` VARCHAR(250) NOT NULL
-) ENGINE = InnoDB;
-CREATE  TABLE IF NOT EXISTS `config_options` (
-`name` varchar(50) not null primary key,
-`value` varchar(50)) ENGINE = InnoDB;
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 "innodb_only", "innodb_only", "innodb_only");
 INSERT INTO config_options VALUES("separator", "|");

=== added file 'mysql-test/suite/memcached/r/memcached_lock.result'
--- a/mysql-test/suite/memcached/r/memcached_lock.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/memcached/r/memcached_lock.result	2012-02-20 16:29:18 +0000
@@ -0,0 +1,99 @@
+CALL mtr.add_suppression("daemon-memcached-w-batch-size': unsigned");
+CALL mtr.add_suppression("Could not obtain server's UPN to be used as target service name");
+CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
+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", "|");
+INSERT INTO containers VALUES ("desc_t1", "test", "t1",
+"c1", "c2,c21", "c3", "c4", "c5", "PRIMARY");
+CREATE USER mysqltest1@localhost;
+CREATE USER mysqltest2@localhost;
+USE test;
+CREATE TABLE t1        (c1 VARCHAR(32),
+c2 VARCHAR(1024),
+c21 VARCHAR(1024),
+c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
+ENGINE = INNODB;
+CREATE TABLE t2        (c1 VARCHAR(32),
+c2 VARCHAR(255),
+c21 VARCHAR(255),
+c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
+ENGINE = INNODB;
+INSERT INTO t1 VALUES ('D', 'Darmstadt', 'City', 0, 0, 0);
+INSERT INTO t1 VALUES ('B', 'Berlin', 'Mitte', 0, 0, 0);
+INSERT INTO t1 VALUES ('C', 'Cottbus', 'West', 0, 0 ,0);
+INSERT INTO t1 VALUES ('H', 'Hamburg', 'Norderstedt', 0, 0, 0);
+INSERT INTO t2 VALUES ('D', 'Darmstadt', 'City', 0, 0, 0);
+INSERT INTO t2 VALUES ('B', 'Berlin', 'Mitte', 0, 0, 0);
+INSERT INTO t2 VALUES ('C', 'Cottbus', 'West', 0, 0 ,0);
+INSERT INTO t2 VALUES ('H', 'Hamburg', 'Norderstedt', 0, 0, 0);
+INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
+USE test;
+SELECT c1,c2,c21 FROM t1;
+c1	c2	c21
+B	Berlin	Mitte
+C	Cottbus	West
+D	Darmstadt	City
+H	Hamburg	Norderstedt
+LOCK TABLES t2 READ;
+Here the memcached results with D,B,H,C:
+Darmstadt|City
+Berlin|Mitte
+Hamburg|Norderstedt
+Cottbus|West
+SELECT c1,c2,c21 FROM t1;
+c1	c2	c21
+B	Berlin	Mitte
+C	Cottbus	West
+D	Darmstadt	City
+H	Hamburg	Norderstedt
+UNLOCK TABLES;
+Here the memcached results after set:
+Essen|Ost
+SELECT c1,c2,c21 FROM t1;
+c1	c2	c21
+B	Berlin	Mitte
+C	Cottbus	West
+D	Darmstadt	City
+E	Essen	Ost
+H	Hamburg	Norderstedt
+LOCK TABLES t2 WRITE;
+Here the memcached results after add:
+Frankfurt|Sachsenhause
+SELECT c1,c2,c21 FROM t1;
+ERROR HY000: Table 't1' was not locked with LOCK TABLES
+Here the memcached results after replace:
+Frankfurt a. M.|Sachsenhausen
+SELECT c1,c2,c21 FROM t1;
+ERROR HY000: Table 't1' was not locked with LOCK TABLES
+Here the memcached results after delete:
+SELECT c1,c2,c21 FROM t1;
+ERROR HY000: Table 't1' was not locked with LOCK TABLES
+Here the memcached results after add Frankfurt|:
+Frankfurt|
+Here the memcached results after add |Airport:
+Frankfurt|
+SELECT c1,c2,c21 FROM t1;
+ERROR HY000: Table 't1' was not locked with LOCK TABLES
+UNLOCK TABLES;
+Here the memcached results after replace Frankfurt a.M.:
+Frankfurt a. M.|
+Here the memcached results after replace Sachsenhausen:
+|Sachsenhausen
+SELECT c1,c2,c21 FROM t1;
+c1	c2	c21
+B	Berlin	Mitte
+C	Cottbus	West
+D	Darmstadt	City
+E	Essen	Ost
+F	NULL	Sachsenhausen
+H	Hamburg	Norderstedt
+DROP TABLE t1;
+DROP TABLE t2;
+DROP DATABASE innodb_memcache;
+DROP USER mysqltest1@localhost;
+DROP USER mysqltest2@localhost;
+SET @@global.tx_isolation= @tx_isolation;

=== added file 'mysql-test/suite/memcached/r/memcached_mdl.result'
--- a/mysql-test/suite/memcached/r/memcached_mdl.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/memcached/r/memcached_mdl.result	2012-02-20 16:29:18 +0000
@@ -0,0 +1,110 @@
+CALL mtr.add_suppression("daemon-memcached-w-batch-size': unsigned");
+CALL mtr.add_suppression("Could not obtain server's UPN to be used as target service name");
+CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
+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", "|");
+INSERT INTO containers VALUES ("desc_t1", "test", "t1",
+"c1", "c2,c21", "c3", "c4", "c5", "PRIMARY");
+CREATE USER mysqltest1@localhost;
+CREATE USER mysqltest2@localhost;
+USE test;
+CREATE TABLE t1        (c1 VARCHAR(32),
+c2 VARCHAR(1024),
+c21 VARCHAR(1024),
+c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
+ENGINE = INNODB;
+INSERT INTO t1 VALUES ('D', 'Darmstadt', 'City', 0, 0, 0);
+INSERT INTO t1 VALUES ('B', 'Berlin', 'Mitte', 0, 0, 0);
+INSERT INTO t1 VALUES ('C', 'Cottbus', 'West', 0, 0 ,0);
+INSERT INTO t1 VALUES ('H', 'Hamburg', 'Norderstedt', 0, 0, 0);
+INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
+USE test;
+SELECT c1,c2,c21 FROM t1;
+c1	c2	c21
+B	Berlin	Mitte
+C	Cottbus	West
+D	Darmstadt	City
+H	Hamburg	Norderstedt
+LOCK TABLES t1 READ;
+Here the memcached results with D,B,H,C:
+Darmstadt|City
+Berlin|Mitte
+Hamburg|Norderstedt
+Cottbus|West
+SELECT c1,c2,c21 FROM t1;
+c1	c2	c21
+B	Berlin	Mitte
+C	Cottbus	West
+D	Darmstadt	City
+H	Hamburg	Norderstedt
+UNLOCK TABLES;
+Here the memcached results after set:
+Essen|Ost
+SELECT c1,c2,c21 FROM t1;
+c1	c2	c21
+B	Berlin	Mitte
+C	Cottbus	West
+D	Darmstadt	City
+E	Essen	Ost
+H	Hamburg	Norderstedt
+Here the memcached results after add:
+Frankfurt|Sachsenhause
+SELECT c1,c2,c21 FROM t1;
+c1	c2	c21
+B	Berlin	Mitte
+C	Cottbus	West
+D	Darmstadt	City
+E	Essen	Ost
+F	Frankfurt	Sachsenhause
+H	Hamburg	Norderstedt
+Here the memcached results after replace:
+Frankfurt a. M.|Sachsenhausen
+SELECT c1,c2,c21 FROM t1;
+c1	c2	c21
+B	Berlin	Mitte
+C	Cottbus	West
+D	Darmstadt	City
+E	Essen	Ost
+F	Frankfurt a. M.	Sachsenhausen
+H	Hamburg	Norderstedt
+Here the memcached results after delete:
+SELECT c1,c2,c21 FROM t1;
+c1	c2	c21
+B	Berlin	Mitte
+C	Cottbus	West
+D	Darmstadt	City
+E	Essen	Ost
+H	Hamburg	Norderstedt
+Here the memcached results after add Frankfurt|:
+Frankfurt
+Here the memcached results after add |Airport:
+Frankfurt
+SELECT c1,c2,c21 FROM t1;
+c1	c2	c21
+B	Berlin	Mitte
+C	Cottbus	West
+D	Darmstadt	City
+E	Essen	Ost
+F	Frankfurt	NULL
+H	Hamburg	Norderstedt
+Here the memcached results after replace Frankfurt a.M.:
+Frankfurt a. M.
+Here the memcached results after replace Sachsenhausen:
+Sachsenhausen
+SELECT c1,c2,c21 FROM t1;
+c1	c2	c21
+B	Berlin	Mitte
+C	Cottbus	West
+D	Darmstadt	City
+E	Essen	Ost
+F	NULL	Sachsenhausen
+H	Hamburg	Norderstedt
+DROP TABLE t1;
+DROP DATABASE innodb_memcache;
+DROP USER mysqltest1@localhost;
+DROP USER mysqltest2@localhost;
+SET @@global.tx_isolation= @tx_isolation;

=== modified file 'mysql-test/suite/memcached/r/memcached_replace.result'
--- a/mysql-test/suite/memcached/r/memcached_replace.result	2012-02-07 13:20:25 +0000
+++ b/mysql-test/suite/memcached/r/memcached_replace.result	2012-02-20 16:29:18 +0000
@@ -4,33 +4,6 @@ CALL mtr.add_suppression("InnoDB: Warnin
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 UNINSTALL PLUGIN daemon_memcached;
-create database innodb_memcache;
-use innodb_memcache;
-CREATE  TABLE IF NOT EXISTS `cache_policies` (
-`policy_name` VARCHAR(40) PRIMARY KEY,
-`get_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL ,
-`set_policy` ENUM('innodb_only', 'cache_only','caching','disabled')
-NOT NULL ,
-`delete_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL,
-`flush_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL
-) ENGINE = innodb;
-CREATE  TABLE IF NOT EXISTS `containers` (
-`name` varchar(50) not null primary key,
-`db_schema` VARCHAR(250) NOT NULL,
-`db_table` VARCHAR(250) NOT NULL,
-`key_columns` VARCHAR(250) NOT NULL,
-`value_columns` VARCHAR(250),
-`flags` VARCHAR(250) NOT NULL DEFAULT "0",
-`cas_column` VARCHAR(250),
-`expire_time_column` VARCHAR(250),
-`unique_idx_name_on_key` VARCHAR(250) NOT NULL
-) ENGINE = InnoDB;
-CREATE  TABLE IF NOT EXISTS `config_options` (
-`name` varchar(50) not null primary key,
-`value` varchar(50)) ENGINE = InnoDB;
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 "innodb_only", "innodb_only", "innodb_only");
 INSERT INTO config_options VALUES("separator", "|");

=== modified file 'mysql-test/suite/memcached/r/memcached_sep_1.result'
--- a/mysql-test/suite/memcached/r/memcached_sep_1.result	2012-02-20 10:12:50 +0000
+++ b/mysql-test/suite/memcached/r/memcached_sep_1.result	2012-02-20 16:29:18 +0000
@@ -4,33 +4,6 @@ CALL mtr.add_suppression("InnoDB: Warnin
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 UNINSTALL PLUGIN daemon_memcached;
-create database innodb_memcache;
-use innodb_memcache;
-CREATE  TABLE IF NOT EXISTS `cache_policies` (
-`policy_name` VARCHAR(40) PRIMARY KEY,
-`get_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL ,
-`set_policy` ENUM('innodb_only', 'cache_only','caching','disabled')
-NOT NULL ,
-`delete_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL,
-`flush_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL
-) ENGINE = innodb;
-CREATE  TABLE IF NOT EXISTS `containers` (
-`name` varchar(50) not null primary key,
-`db_schema` VARCHAR(250) NOT NULL,
-`db_table` VARCHAR(250) NOT NULL,
-`key_columns` VARCHAR(250) NOT NULL,
-`value_columns` VARCHAR(250),
-`flags` VARCHAR(250) NOT NULL DEFAULT "0",
-`cas_column` VARCHAR(250),
-`expire_time_column` VARCHAR(250),
-`unique_idx_name_on_key` VARCHAR(250) NOT NULL
-) ENGINE = InnoDB;
-CREATE  TABLE IF NOT EXISTS `config_options` (
-`name` varchar(50) not null primary key,
-`value` varchar(50)) ENGINE = InnoDB;
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 "innodb_only", "innodb_only", "innodb_only");
 INSERT INTO config_options VALUES("separator", "0");
@@ -69,7 +42,7 @@ C	Cottbus	West	3	cccccccccccccc	3456	201
 D	Darmstadt	City	1	dddddddddddddd	1234	2012
 H	Hamburg	Norderstedt	4	hhhhhhhhhh	4567	2012
 Here the memcached results after set:
-Essen|Ost|5|eeeeeeeeeee|5678|20120000
+Essen|Ost|5|eeeeeeeeeee|5678|2012
 Essen0Ost050eeeeeeeeeee0567802
 SELECT c1,c2,c21,c22,c23,c24,c25 FROM t1;
 c1	c2	c21	c22	c23	c24	c25

=== modified file 'mysql-test/suite/memcached/r/memcached_sep_2.result'
--- a/mysql-test/suite/memcached/r/memcached_sep_2.result	2012-02-20 10:12:50 +0000
+++ b/mysql-test/suite/memcached/r/memcached_sep_2.result	2012-02-20 16:29:18 +0000
@@ -4,33 +4,6 @@ CALL mtr.add_suppression("InnoDB: Warnin
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 UNINSTALL PLUGIN daemon_memcached;
-create database innodb_memcache;
-use innodb_memcache;
-CREATE  TABLE IF NOT EXISTS `cache_policies` (
-`policy_name` VARCHAR(40) PRIMARY KEY,
-`get_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL ,
-`set_policy` ENUM('innodb_only', 'cache_only','caching','disabled')
-NOT NULL ,
-`delete_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL,
-`flush_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL
-) ENGINE = innodb;
-CREATE  TABLE IF NOT EXISTS `containers` (
-`name` varchar(50) not null primary key,
-`db_schema` VARCHAR(250) NOT NULL,
-`db_table` VARCHAR(250) NOT NULL,
-`key_columns` VARCHAR(250) NOT NULL,
-`value_columns` VARCHAR(250),
-`flags` VARCHAR(250) NOT NULL DEFAULT "0",
-`cas_column` VARCHAR(250),
-`expire_time_column` VARCHAR(250),
-`unique_idx_name_on_key` VARCHAR(250) NOT NULL
-) ENGINE = InnoDB;
-CREATE  TABLE IF NOT EXISTS `config_options` (
-`name` varchar(50) not null primary key,
-`value` varchar(50)) ENGINE = InnoDB;
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 "innodb_only", "innodb_only", "innodb_only");
 INSERT INTO config_options VALUES("separator", "+++");
@@ -69,7 +42,7 @@ C	Cottbus	West	3	cccccccccccccc	3456	201
 D	Darmstadt	City	1	dddddddddddddd	1234	2012
 H	Hamburg	Norderstedt	4	hhhhhhhhhh	4567	2012
 Here the memcached results after set:
-Essen|Ost|5|eeeeeeeeeee|5678|2012+++++++++++++++
+Essen|Ost|5|eeeeeeeeeee|5678|2012
 Essen+++Ost+++5+++eeeeeeeeeee+++5678+++2012
 SELECT c1,c2,c21,c22,c23,c24,c25 FROM t1;
 c1	c2	c21	c22	c23	c24	c25

=== modified file 'mysql-test/suite/memcached/r/memcached_sep_3.result'
--- a/mysql-test/suite/memcached/r/memcached_sep_3.result	2012-02-20 10:12:50 +0000
+++ b/mysql-test/suite/memcached/r/memcached_sep_3.result	2012-02-20 16:29:18 +0000
@@ -4,34 +4,6 @@ CALL mtr.add_suppression("InnoDB: Warnin
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 UNINSTALL PLUGIN daemon_memcached;
-set names utf8;
-create database innodb_memcache;
-use innodb_memcache;
-CREATE  TABLE IF NOT EXISTS `cache_policies` (
-`policy_name` VARCHAR(40) PRIMARY KEY,
-`get_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL ,
-`set_policy` ENUM('innodb_only', 'cache_only','caching','disabled')
-NOT NULL ,
-`delete_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL,
-`flush_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL
-) ENGINE = innodb;
-CREATE  TABLE IF NOT EXISTS `containers` (
-`name` varchar(50) not null primary key,
-`db_schema` VARCHAR(250) NOT NULL,
-`db_table` VARCHAR(250) NOT NULL,
-`key_columns` VARCHAR(250) NOT NULL,
-`value_columns` VARCHAR(250),
-`flags` VARCHAR(250) NOT NULL DEFAULT "0",
-`cas_column` VARCHAR(250),
-`expire_time_column` VARCHAR(250),
-`unique_idx_name_on_key` VARCHAR(250) NOT NULL
-) ENGINE = InnoDB;
-CREATE  TABLE IF NOT EXISTS `config_options` (
-`name` varchar(50) not null primary key,
-`value` varchar(50)) ENGINE = InnoDB;
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 "innodb_only", "innodb_only", "innodb_only");
 INSERT INTO config_options VALUES("separator", "ü");
@@ -59,10 +31,10 @@ C	Cottbus	West	3	cccccccccccccc	3456	201
 D	Darmstadt	City	1	dddddddddddddd	1234	2012
 H	Hamburg	Norderstedt	4	hhhhhhhhhh	4567	2012
 Here the memcached results with D,B,H,C:
-Darmstadt�1�ddddddddd�2012
-Berlin��bbbbbbbbbbb�2012
-Hamburg�rstedt�hhhhhhh�2012
-Cottbus�3�ccccccccc�2012
+DarmstadtüCityü1üddddddddddddddü1234ü2012
+BerlinüMitteü2übbbbbbbbbbbbbbü2345ü2012
+HamburgüNorderstedtü4ühhhhhhhhhhü4567ü2012
+CottbusüWestü3üccccccccccccccü3456ü2012
 SELECT c1,c2,c21,c22,c23,c24,c25 FROM t1;
 c1	c2	c21	c22	c23	c24	c25
 B	Berlin	Mitte	2	bbbbbbbbbbbbbb	2345	2012
@@ -70,14 +42,14 @@ C	Cottbus	West	3	cccccccccccccc	3456	201
 D	Darmstadt	City	1	dddddddddddddd	1234	2012
 H	Hamburg	Norderstedt	4	hhhhhhhhhh	4567	2012
 Here the memcached results after set:
-Essen|Ost|5|eeeeeeeeeee|5678|2012�-EssenüOstü5üeeeeeeeeeeeü5678ü2012�+Essen|Ost|5|eeeeeeeeeee|5678|2012
+EssenüOstü5üeeeeeeeeeeeü5678ü2012
 SELECT c1,c2,c21,c22,c23,c24,c25 FROM t1;
 c1	c2	c21	c22	c23	c24	c25
 B	Berlin	Mitte	2	bbbbbbbbbbbbbb	2345	2012
 C	Cottbus	West	3	cccccccccccccc	3456	2012
 D	Darmstadt	City	1	dddddddddddddd	1234	2012
-E	EssenüOstü5üeeeeeeeeeeeü5678ü2012	NULL	NULL	NULL	NULL	NULL
+E	Essen	Ost	5	eeeeeeeeeee	5678	2012
 H	Hamburg	Norderstedt	4	hhhhhhhhhh	4567	2012
 DROP TABLE t1;
 DROP DATABASE innodb_memcache;

=== added file 'mysql-test/suite/memcached/r/memcached_sep_4.result'
--- a/mysql-test/suite/memcached/r/memcached_sep_4.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/memcached/r/memcached_sep_4.result	2012-02-20 16:29:18 +0000
@@ -0,0 +1,56 @@
+CALL mtr.add_suppression("daemon-memcached-w-batch-size': unsigned");
+CALL mtr.add_suppression("Could not obtain server's UPN to be used as target service name");
+CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
+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", "0");
+INSERT INTO containers VALUES ("desc_t1", "test", "t1",
+"c1", "c2,c21,c22,c23,c24,c25", "c3", "c4", "c5", "PRIMARY");
+USE test;
+CREATE TABLE t1        (c1 VARCHAR(32),
+c2 VARCHAR(40),
+c21 VARCHAR(40),
+c22 VARCHAR(40),
+c23 VARCHAR(40),
+c24 VARCHAR(40),
+c25 VARCHAR(40),
+c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
+ENGINE = INNODB;
+INSERT INTO t1 VALUES ('D', 'Darmstadt', 'City','1', 'dddddddddddddd', '1234', '2012', 0, 0, 0);
+INSERT INTO t1 VALUES ('B', 'Berlin', 'Mitte', '2', 'bbbbbbbbbbbbbb', '2345', '2012', 0, 0, 0);
+INSERT INTO t1 VALUES ('C', 'Cottbus', 'West', '3', 'cccccccccccccc', '3456', '2012', 0, 0 ,0);
+INSERT INTO t1 VALUES ('H', 'Hamburg', 'Norderstedt', '4', 'hhhhhhhhhh', '4567', '2012', 0, 0, 0);
+INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
+SELECT c1,c2,c21,c22,c23,c24,c25 FROM t1;
+c1	c2	c21	c22	c23	c24	c25
+B	Berlin	Mitte	2	bbbbbbbbbbbbbb	2345	2012
+C	Cottbus	West	3	cccccccccccccc	3456	2012
+D	Darmstadt	City	1	dddddddddddddd	1234	2012
+H	Hamburg	Norderstedt	4	hhhhhhhhhh	4567	2012
+Here the memcached results with D,B,H,C:
+Darmstadt0City010dddddddddddddd0123402012
+Berlin0Mitte020bbbbbbbbbbbbbb0234502012
+Hamburg0Norderstedt040hhhhhhhhhh0456702012
+Cottbus0West030cccccccccccccc0345602012
+SELECT c1,c2,c21,c22,c23,c24,c25 FROM t1;
+c1	c2	c21	c22	c23	c24	c25
+B	Berlin	Mitte	2	bbbbbbbbbbbbbb	2345	2012
+C	Cottbus	West	3	cccccccccccccc	3456	2012
+D	Darmstadt	City	1	dddddddddddddd	1234	2012
+H	Hamburg	Norderstedt	4	hhhhhhhhhh	4567	2012
+Here the memcached results after set:
+Essen|Ost|5|eeeeeeeeeee|5678|2012
+Essen0Ost050eeeeeeeeeee0567802
+SELECT c1,c2,c21,c22,c23,c24,c25 FROM t1;
+c1	c2	c21	c22	c23	c24	c25
+B	Berlin	Mitte	2	bbbbbbbbbbbbbb	2345	2012
+C	Cottbus	West	3	cccccccccccccc	3456	2012
+D	Darmstadt	City	1	dddddddddddddd	1234	2012
+E	Essen	Ost	5	eeeeeeeeeee	5678	2
+H	Hamburg	Norderstedt	4	hhhhhhhhhh	4567	2012
+DROP TABLE t1;
+DROP DATABASE innodb_memcache;
+SET @@global.tx_isolation= @tx_isolation;

=== modified file 'mysql-test/suite/memcached/r/memcached_set.result'
--- a/mysql-test/suite/memcached/r/memcached_set.result	2012-02-07 13:20:25 +0000
+++ b/mysql-test/suite/memcached/r/memcached_set.result	2012-02-20 16:29:18 +0000
@@ -4,33 +4,6 @@ CALL mtr.add_suppression("InnoDB: Warnin
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 UNINSTALL PLUGIN daemon_memcached;
-create database innodb_memcache;
-use innodb_memcache;
-CREATE  TABLE IF NOT EXISTS `cache_policies` (
-`policy_name` VARCHAR(40) PRIMARY KEY,
-`get_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL ,
-`set_policy` ENUM('innodb_only', 'cache_only','caching','disabled')
-NOT NULL ,
-`delete_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL,
-`flush_policy` ENUM('innodb_only', 'cache_only', 'caching','disabled')
-NOT NULL
-) ENGINE = innodb;
-CREATE  TABLE IF NOT EXISTS `containers` (
-`name` varchar(50) not null primary key,
-`db_schema` VARCHAR(250) NOT NULL,
-`db_table` VARCHAR(250) NOT NULL,
-`key_columns` VARCHAR(250) NOT NULL,
-`value_columns` VARCHAR(250),
-`flags` VARCHAR(250) NOT NULL DEFAULT "0",
-`cas_column` VARCHAR(250),
-`expire_time_column` VARCHAR(250),
-`unique_idx_name_on_key` VARCHAR(250) NOT NULL
-) ENGINE = InnoDB;
-CREATE  TABLE IF NOT EXISTS `config_options` (
-`name` varchar(50) not null primary key,
-`value` varchar(50)) ENGINE = InnoDB;
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 "innodb_only", "innodb_only", "innodb_only");
 INSERT INTO config_options VALUES("separator", "|");

=== modified file 'mysql-test/suite/memcached/t/memcached_2_cols-master.opt'
--- a/mysql-test/suite/memcached/t/memcached_2_cols-master.opt	2012-02-10 11:56:53 +0000
+++ b/mysql-test/suite/memcached/t/memcached_2_cols-master.opt	2012-02-20 16:29:18 +0000
@@ -1,2 +1,3 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
+--daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR

=== modified file 'mysql-test/suite/memcached/t/memcached_2_cols.test'
--- a/mysql-test/suite/memcached/t/memcached_2_cols.test	2012-02-10 11:56:53 +0000
+++ b/mysql-test/suite/memcached/t/memcached_2_cols.test	2012-02-20 16:29:18 +0000
@@ -11,7 +11,9 @@ source include/have_innodb.inc;
 UNINSTALL PLUGIN daemon_memcached;
 
 # Create the memcached tables
+--disable_query_log
 source suite/memcached/inc/memcache_config.inc;
+--enable_query_log
 
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 				  "innodb_only", "innodb_only", "innodb_only");

=== modified file 'mysql-test/suite/memcached/t/memcached_2_intcols-master.opt'
--- a/mysql-test/suite/memcached/t/memcached_2_intcols-master.opt	2012-02-10 11:56:53 +0000
+++ b/mysql-test/suite/memcached/t/memcached_2_intcols-master.opt	2012-02-20 16:29:18 +0000
@@ -1,2 +1,3 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
+--daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR

=== modified file 'mysql-test/suite/memcached/t/memcached_2_intcols.test'
--- a/mysql-test/suite/memcached/t/memcached_2_intcols.test	2012-02-16 08:35:09 +0000
+++ b/mysql-test/suite/memcached/t/memcached_2_intcols.test	2012-02-20 16:29:18 +0000
@@ -11,7 +11,9 @@ source include/have_innodb.inc;
 UNINSTALL PLUGIN daemon_memcached;
 
 # Create the memcached tables
+--disable_query_log
 source suite/memcached/inc/memcache_config.inc;
+--enable_query_log
 
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 				  "innodb_only", "innodb_only", "innodb_only");

=== modified file 'mysql-test/suite/memcached/t/memcached_50_cols-master.opt'
--- a/mysql-test/suite/memcached/t/memcached_50_cols-master.opt	2012-02-16 08:35:09 +0000
+++ b/mysql-test/suite/memcached/t/memcached_50_cols-master.opt	2012-02-20 16:29:18 +0000
@@ -1,2 +1,3 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
+--daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR

=== modified file 'mysql-test/suite/memcached/t/memcached_5_cols-master.opt'
--- a/mysql-test/suite/memcached/t/memcached_5_cols-master.opt	2012-02-16 08:35:09 +0000
+++ b/mysql-test/suite/memcached/t/memcached_5_cols-master.opt	2012-02-20 16:29:18 +0000
@@ -1,2 +1,3 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
+--daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR

=== modified file 'mysql-test/suite/memcached/t/memcached_5_cols.test'
--- a/mysql-test/suite/memcached/t/memcached_5_cols.test	2012-02-16 08:35:09 +0000
+++ b/mysql-test/suite/memcached/t/memcached_5_cols.test	2012-02-20 16:29:18 +0000
@@ -11,7 +11,9 @@ source include/have_innodb.inc;
 UNINSTALL PLUGIN daemon_memcached;
 
 # Create the memcached tables
+--disable_query_log
 source suite/memcached/inc/memcache_config.inc;
+--enable_query_log
 
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 				  "innodb_only", "innodb_only", "innodb_only");

=== added file 'mysql-test/suite/memcached/t/memcached_5_utf8-master.opt'
--- a/mysql-test/suite/memcached/t/memcached_5_utf8-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/memcached/t/memcached_5_utf8-master.opt	2012-02-20 16:29:18 +0000
@@ -0,0 +1,3 @@
+$DAEMON_MEMCACHED_OPT
+$DAEMON_MEMCACHED_LOAD
+--daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR

=== added file 'mysql-test/suite/memcached/t/memcached_5_utf8.test'
--- a/mysql-test/suite/memcached/t/memcached_5_utf8.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/memcached/t/memcached_5_utf8.test	2012-02-20 16:29:18 +0000
@@ -0,0 +1,95 @@
+CALL mtr.add_suppression("daemon-memcached-w-batch-size': unsigned");
+CALL mtr.add_suppression("Could not obtain server's UPN to be used as target service name");
+CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
+
+SET @tx_isolation= @@global.tx_isolation;
+SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+
+source include/have_innodb.inc;
+
+# Stop plugin befor innodb_memcached configuration
+UNINSTALL PLUGIN daemon_memcached;
+
+# Create the memcached tables
+--disable_query_log
+source suite/memcached/inc/memcache_config.inc;
+--enable_query_log
+
+INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
+				  "innodb_only", "innodb_only", "innodb_only");
+
+INSERT INTO config_options VALUES("separator", "|");
+
+# describe table for memcache
+INSERT INTO containers VALUES ("desc_t1", "test", "t1",
+			       "c1", "c2,c21,c22,c23,c24,c25", "c3", "c4", "c5", "PRIMARY");
+
+USE test;
+
+CREATE TABLE t1        (c1 VARCHAR(32),
+			c2 VARCHAR(40),
+			c21 VARCHAR(40),
+			c22 VARCHAR(40),
+			c23 VARCHAR(40),
+			c24 VARCHAR(40),
+			c25 VARCHAR(40),
+			c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
+ENGINE = INNODB DEFAULT CHARSET UTF8;
+
+INSERT INTO t1 VALUES ('D', 'Darmstadt', 'City','1', 'dddddddddddddd', '1234', '2012', 0, 0, 0);
+INSERT INTO t1 VALUES ('B', 'Berlin', 'Mitte', '2', 'bbbbbbbbbbbbbb', '2345', '2012', 0, 0, 0);
+INSERT INTO t1 VALUES ('C', 'Cottbus', 'West', '3', 'cccccccccccccc', '3456', '2012', 0, 0 ,0);
+INSERT INTO t1 VALUES ('M', 'München', 'Süd', '4', 'ÜÖÄßbefore plugin can be started!
+INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
+
+SHOW CREATE TABLE t1;
+
+# The following select is writing all to  memcache otherwisw memcache is empty.
+--sorted_result
+SELECT c1,c2,c21,c22,c23,c24,c25 FROM t1;
+
+perl;
+use DBI;
+use Cache::Memcached;
+my $memd = new Cache::Memcached {
+  'servers' => [ "127.0.0.1:11211" ]
+};
+print "Here the memcached results with D,B,M,C:\n";
+$val = $memd->get("D");
+if ($val) { print "$val\n"; }
+$val = $memd->get("B");
+if ($val) { print "$val\n"; }
+$val = $memd->get("M");
+if ($val) { print "$val\n"; }
+$val = $memd->get("C");
+if ($val) { print "$val\n"; }
+$memd->disconnect_all;
+EOF
+
+# The following select is writing all to  memcache otherwisw memcache is empty.
+--sorted_result
+SELECT c1,c2,c21,c22,c23,c24,c25 FROM t1;
+
+perl;
+use DBI;
+use Cache::Memcached;
+my $memd = new Cache::Memcached {
+  'servers' => [ "127.0.0.1:11211" ]
+};
+print "Here the memcached results after set:\n";
+$val = $memd->set("Ü","Ülzen|City|5|üöäßÜÖÄ|5678|2012");
+$val = $memd->get("Ü");
+if ($val) { print "$val\n"; }
+$memd->disconnect_all;
+EOF
+
+# The following select is writing all to  memcache otherwisw memcache is empty.
+--sorted_result
+SELECT c1,c2,c21,c22,c23,c24,c25 FROM t1;
+
+DROP TABLE t1;
+DROP DATABASE innodb_memcache;
+ 
+SET @@global.tx_isolation= @tx_isolation;

=== added file 'mysql-test/suite/memcached/t/memcached_NULL_cols-master.opt'
--- a/mysql-test/suite/memcached/t/memcached_NULL_cols-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/memcached/t/memcached_NULL_cols-master.opt	2012-02-20 16:29:18 +0000
@@ -0,0 +1,3 @@
+$DAEMON_MEMCACHED_OPT
+$DAEMON_MEMCACHED_LOAD
+--daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR

=== added file 'mysql-test/suite/memcached/t/memcached_NULL_cols.test'
--- a/mysql-test/suite/memcached/t/memcached_NULL_cols.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/memcached/t/memcached_NULL_cols.test	2012-02-20 16:29:18 +0000
@@ -0,0 +1,146 @@
+CALL mtr.add_suppression("daemon-memcached-w-batch-size': unsigned");
+CALL mtr.add_suppression("Could not obtain server's UPN to be used as target service name");
+CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
+
+SET @tx_isolation= @@global.tx_isolation;
+SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+
+source include/have_innodb.inc;
+
+# Stop plugin befor innodb_memcached configuration
+UNINSTALL PLUGIN daemon_memcached;
+
+# Create the memcached tables
+--disable_query_log
+source suite/memcached/inc/memcache_config.inc;
+--enable_query_log
+
+INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
+				  "innodb_only", "innodb_only", "innodb_only");
+
+INSERT INTO config_options VALUES("separator", "|");
+
+# describe table for memcache
+INSERT INTO containers VALUES ("desc_t1", "test", "t1",
+			       "c1", "c2,c21,c22,c23,c24,c25", "c3", "c4", "c5", "PRIMARY");
+
+USE test;
+
+CREATE TABLE t1        (c1 VARCHAR(32),
+			c2 VARCHAR(40),
+			c21 VARCHAR(40),
+			c22 VARCHAR(40),
+			c23 VARCHAR(40),
+			c24 VARCHAR(40),
+			c25 VARCHAR(40),
+			c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
+ENGINE = INNODB;
+
+INSERT INTO t1 VALUES ('D', 'Darmstadt', NULL,'1', 'dddddddddddddd', '1234', NULL, 0, 0, 0);
+INSERT INTO t1 VALUES ('B', 'Berlin', 'Mitte', NULL, 'bbbbbbbbbbbbbb', '2345', '2012', 0, 0, 0);
+INSERT INTO t1 VALUES ('C', 'Cottbus', 'West', '3', NULL, '3456', '2012', 0, 0 ,0);
+INSERT INTO t1 VALUES ('H', NULL, NULL, NULL, 'hhhhhhhhhh', NULL, NULL, 0, 0, 0);
+
+# Tables must exist before plugin can be started!
+INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
+
+# The following select is writing all to  memcache otherwisw memcache is empty.
+--sorted_result
+SELECT c1,c2,c21,c22,c23,c24,c25 FROM t1;
+
+perl;
+use DBI;
+use Cache::Memcached;
+my $memd = new Cache::Memcached {
+  'servers' => [ "127.0.0.1:11211" ]
+};
+print "Here the memcached results with D,B,H,C:\n";
+$val = $memd->get("D");
+if ($val) { print "$val\n"; }
+$val = $memd->get("B");
+if ($val) { print "$val\n"; }
+$val = $memd->get("H");
+if ($val) { print "$val\n"; }
+$val = $memd->get("C");
+if ($val) { print "$val\n"; }
+$memd->disconnect_all;
+EOF
+
+# The following select is writing all to  memcache otherwisw memcache is empty.
+--sorted_result
+SELECT c1,c2,c21,c22,c23,c24,c25 FROM t1;
+
+perl;
+use DBI;
+use Cache::Memcached;
+my $memd = new Cache::Memcached {
+  'servers' => [ "127.0.0.1:11211" ]
+};
+print "Here the memcached results after set:\n";
+$val = $memd->set("E","Essen||||5678|2012");
+$val = $memd->get("E");
+if ($val) { print "$val\n"; }
+$memd->disconnect_all;
+EOF
+
+# The following select is writing all to  memcache otherwisw memcache is empty.
+--sorted_result
+SELECT c1,c2,c21,c22,c23,c24,c25 FROM t1;
+
+perl;
+use DBI;
+use Cache::Memcached;
+my $memd = new Cache::Memcached {
+  'servers' => [ "127.0.0.1:11211" ]
+};
+print "Here the memcached results after add:\n";
+$val = $memd->add("F","Frankfurt|Airport||||2012");
+$val = $memd->get("F");
+if ($val) { print "$val\n"; }
+$memd->disconnect_all;
+EOF
+
+# The following select is writing all to  memcache otherwisw memcache is empty.
+--sorted_result
+SELECT c1,c2,c21,c22,c23,c24,c25 FROM t1;
+
+perl;
+use DBI;
+use Cache::Memcached;
+my $memd = new Cache::Memcached {
+  'servers' => [ "127.0.0.1:11211" ]
+};
+print "Here the memcached results after replace:\n";
+$val = $memd->replace("F","Frankfurt a.M.|Sachsenhausen|61|fffff|6789|");
+$val = $memd->get("F");
+if ($val) { print "$val\n"; }
+$memd->disconnect_all;
+EOF
+
+# The following select is writing all to  memcache otherwisw memcache is empty.
+--sorted_result
+SELECT c1,c2,c21,c22,c23,c24,c25 FROM t1;
+
+perl;
+use DBI;
+use Cache::Memcached;
+my $memd = new Cache::Memcached {
+  'servers' => [ "127.0.0.1:11211" ]
+};
+print "Here the memcached results after delete:\n";
+$val = $memd->delete("F");
+$val = $memd->get("E");
+if ($val) { print "$val\n"; }
+$val = $memd->get("F");
+if ($val) { print "$val\n"; }
+$memd->disconnect_all;
+EOF
+
+# The following select is writing all to  memcache otherwisw memcache is empty.
+--sorted_result
+SELECT c1,c2,c21,c22,c23,c24,c25 FROM t1;
+
+DROP TABLE t1;
+DROP DATABASE innodb_memcache;
+ 
+SET @@global.tx_isolation= @tx_isolation;

=== modified file 'mysql-test/suite/memcached/t/memcached_add-master.opt'
--- a/mysql-test/suite/memcached/t/memcached_add-master.opt	2012-02-07 13:20:25 +0000
+++ b/mysql-test/suite/memcached/t/memcached_add-master.opt	2012-02-20 16:29:18 +0000
@@ -1,2 +1,3 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
+--daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR

=== modified file 'mysql-test/suite/memcached/t/memcached_add.test'
--- a/mysql-test/suite/memcached/t/memcached_add.test	2012-02-07 13:20:25 +0000
+++ b/mysql-test/suite/memcached/t/memcached_add.test	2012-02-20 16:29:18 +0000
@@ -11,7 +11,9 @@ source include/have_innodb.inc;
 UNINSTALL PLUGIN daemon_memcached;
 
 # Create the memcached tables
+--disable_query_log
 source suite/memcached/inc/memcache_config.inc;
+--enable_query_log
 
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 				  "innodb_only", "innodb_only", "innodb_only");

=== modified file 'mysql-test/suite/memcached/t/memcached_decr-master.opt'
--- a/mysql-test/suite/memcached/t/memcached_decr-master.opt	2012-02-07 13:20:25 +0000
+++ b/mysql-test/suite/memcached/t/memcached_decr-master.opt	2012-02-20 16:29:18 +0000
@@ -1,2 +1,3 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
+--daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR

=== modified file 'mysql-test/suite/memcached/t/memcached_decr.test'
--- a/mysql-test/suite/memcached/t/memcached_decr.test	2012-02-07 13:20:25 +0000
+++ b/mysql-test/suite/memcached/t/memcached_decr.test	2012-02-20 16:29:18 +0000
@@ -11,7 +11,9 @@ source include/have_innodb.inc;
 UNINSTALL PLUGIN daemon_memcached;
 
 # Create the memcached tables
+--disable_query_log
 source suite/memcached/inc/memcache_config.inc;
+--enable_query_log
 
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 				  "innodb_only", "innodb_only", "innodb_only");

=== modified file 'mysql-test/suite/memcached/t/memcached_delete-master.opt'
--- a/mysql-test/suite/memcached/t/memcached_delete-master.opt	2012-02-07 13:20:25 +0000
+++ b/mysql-test/suite/memcached/t/memcached_delete-master.opt	2012-02-20 16:29:18 +0000
@@ -1,2 +1,3 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
+--daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR

=== modified file 'mysql-test/suite/memcached/t/memcached_delete.test'
--- a/mysql-test/suite/memcached/t/memcached_delete.test	2012-02-07 13:20:25 +0000
+++ b/mysql-test/suite/memcached/t/memcached_delete.test	2012-02-20 16:29:18 +0000
@@ -11,7 +11,9 @@ source include/have_innodb.inc;
 UNINSTALL PLUGIN daemon_memcached;
 
 # Create the memcached tables
+--disable_query_log
 source suite/memcached/inc/memcache_config.inc;
+--enable_query_log
 
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 				  "innodb_only", "innodb_only", "innodb_only");

=== modified file 'mysql-test/suite/memcached/t/memcached_get-master.opt'
--- a/mysql-test/suite/memcached/t/memcached_get-master.opt	2012-02-07 13:20:25 +0000
+++ b/mysql-test/suite/memcached/t/memcached_get-master.opt	2012-02-20 16:29:18 +0000
@@ -1,2 +1,3 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
+--daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR

=== modified file 'mysql-test/suite/memcached/t/memcached_get.test'
--- a/mysql-test/suite/memcached/t/memcached_get.test	2012-02-07 13:20:25 +0000
+++ b/mysql-test/suite/memcached/t/memcached_get.test	2012-02-20 16:29:18 +0000
@@ -11,7 +11,9 @@ source include/have_innodb.inc;
 UNINSTALL PLUGIN daemon_memcached;
 
 # Create the memcached tables
+--disable_query_log
 source suite/memcached/inc/memcache_config.inc;
+--enable_query_log
 
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 				  "innodb_only", "innodb_only", "innodb_only");

=== modified file 'mysql-test/suite/memcached/t/memcached_incr-master.opt'
--- a/mysql-test/suite/memcached/t/memcached_incr-master.opt	2012-02-07 13:20:25 +0000
+++ b/mysql-test/suite/memcached/t/memcached_incr-master.opt	2012-02-20 16:29:18 +0000
@@ -1,2 +1,3 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
+--daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR

=== modified file 'mysql-test/suite/memcached/t/memcached_incr.test'
--- a/mysql-test/suite/memcached/t/memcached_incr.test	2012-02-07 13:20:25 +0000
+++ b/mysql-test/suite/memcached/t/memcached_incr.test	2012-02-20 16:29:18 +0000
@@ -11,7 +11,9 @@ source include/have_innodb.inc;
 UNINSTALL PLUGIN daemon_memcached;
 
 # Create the memcached tables
+--disable_query_log
 source suite/memcached/inc/memcache_config.inc;
+--enable_query_log
 
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 				  "innodb_only", "innodb_only", "innodb_only");

=== added file 'mysql-test/suite/memcached/t/memcached_lock-master.opt'
--- a/mysql-test/suite/memcached/t/memcached_lock-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/memcached/t/memcached_lock-master.opt	2012-02-20 16:29:18 +0000
@@ -0,0 +1,3 @@
+$DAEMON_MEMCACHED_OPT
+$DAEMON_MEMCACHED_LOAD
+--daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR

=== added file 'mysql-test/suite/memcached/t/memcached_lock.test'
--- a/mysql-test/suite/memcached/t/memcached_lock.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/memcached/t/memcached_lock.test	2012-02-20 16:29:18 +0000
@@ -0,0 +1,226 @@
+CALL mtr.add_suppression("daemon-memcached-w-batch-size': unsigned");
+CALL mtr.add_suppression("Could not obtain server's UPN to be used as target service name");
+CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
+
+SET @tx_isolation= @@global.tx_isolation;
+SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+
+source include/have_innodb.inc;
+
+# Stop plugin befor innodb_memcached configuration
+UNINSTALL PLUGIN daemon_memcached;
+
+# Create the memcached tables
+--disable_query_log
+source suite/memcached/inc/memcache_config.inc;
+--enable_query_log
+
+INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
+				  "innodb_only", "innodb_only", "innodb_only");
+
+INSERT INTO config_options VALUES("separator", "|");
+
+# describe table for memcache
+INSERT INTO containers VALUES ("desc_t1", "test", "t1",
+			       "c1", "c2,c21", "c3", "c4", "c5", "PRIMARY");
+
+CREATE USER mysqltest1@localhost;
+CREATE USER mysqltest2@localhost;
+connect (mysqltest1,localhost,mysqltest1,,);
+connect (mysqltest2,localhost,mysqltest2,,);
+connection mysqltest1;
+USE test;
+
+CREATE TABLE t1        (c1 VARCHAR(32),
+			c2 VARCHAR(1024),
+			c21 VARCHAR(1024),
+			c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
+ENGINE = INNODB;
+
+CREATE TABLE t2        (c1 VARCHAR(32),
+			c2 VARCHAR(255),
+			c21 VARCHAR(255),
+			c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
+ENGINE = INNODB;
+
+INSERT INTO t1 VALUES ('D', 'Darmstadt', 'City', 0, 0, 0);
+INSERT INTO t1 VALUES ('B', 'Berlin', 'Mitte', 0, 0, 0);
+INSERT INTO t1 VALUES ('C', 'Cottbus', 'West', 0, 0 ,0);
+INSERT INTO t1 VALUES ('H', 'Hamburg', 'Norderstedt', 0, 0, 0);
+
+INSERT INTO t2 VALUES ('D', 'Darmstadt', 'City', 0, 0, 0);
+INSERT INTO t2 VALUES ('B', 'Berlin', 'Mitte', 0, 0, 0);
+INSERT INTO t2 VALUES ('C', 'Cottbus', 'West', 0, 0 ,0);
+INSERT INTO t2 VALUES ('H', 'Hamburg', 'Norderstedt', 0, 0, 0);
+
+# Tables must exist before plugin can be started!
+connection default;
+INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
+
+# The following select is writing all to  memcache otherwisw memcache is empty.
+connection mysqltest2;
+USE test;
+--sorted_result
+SELECT c1,c2,c21 FROM t1;
+
+connection mysqltest1;
+LOCK TABLES t2 READ;
+
+connection mysqltest2;
+perl;
+use DBI;
+use Cache::Memcached;
+my $memd = new Cache::Memcached {
+  'servers' => [ "127.0.0.1:11211" ]
+};
+print "Here the memcached results with D,B,H,C:\n";
+$val = $memd->get("D");
+if ($val) { print "$val\n"; }
+$val = $memd->get("B");
+if ($val) { print "$val\n"; }
+$val = $memd->get("H");
+if ($val) { print "$val\n"; }
+$val = $memd->get("C");
+if ($val) { print "$val\n"; }
+$memd->disconnect_all;
+EOF
+
+# The following select is writing all to  memcache otherwisw memcache is empty.
+--sorted_result
+SELECT c1,c2,c21 FROM t1;
+
+connection mysqltest1;
+UNLOCK TABLES;
+
+connection mysqltest2;
+perl;
+use DBI;
+use Cache::Memcached;
+my $memd = new Cache::Memcached {
+  'servers' => [ "127.0.0.1:11211" ]
+};
+print "Here the memcached results after set:\n";
+$val = $memd->set("E","Essen|Ost");
+$val = $memd->get("E");
+if ($val) { print "$val\n"; }
+$memd->disconnect_all;
+EOF
+
+# The following select is writing all to  memcache otherwisw memcache is empty.
+--sorted_result
+SELECT c1,c2,c21 FROM t1;
+
+connection mysqltest1;
+LOCK TABLES t2 WRITE;
+
+perl;
+use DBI;
+use Cache::Memcached;
+my $memd = new Cache::Memcached {
+  'servers' => [ "127.0.0.1:11211" ]
+};
+print "Here the memcached results after add:\n";
+$val = $memd->add("F","Frankfurt|Sachsenhause");
+$val = $memd->get("F");
+if ($val) { print "$val\n"; }
+$memd->disconnect_all;
+EOF
+
+# The following select is writing all to  memcache otherwisw memcache is empty.
+--sorted_result
+--error ER_TABLE_NOT_LOCKED
+SELECT c1,c2,c21 FROM t1;
+
+perl;
+use DBI;
+use Cache::Memcached;
+my $memd = new Cache::Memcached {
+  'servers' => [ "127.0.0.1:11211" ]
+};
+print "Here the memcached results after replace:\n";
+$val = $memd->replace("F","Frankfurt a. M.|Sachsenhausen");
+$val = $memd->get("F");
+if ($val) { print "$val\n"; }
+$memd->disconnect_all;
+EOF
+
+# The following select is writing all to  memcache otherwisw memcache is empty.
+--sorted_result
+--error ER_TABLE_NOT_LOCKED
+SELECT c1,c2,c21 FROM t1;
+
+perl;
+use DBI;
+use Cache::Memcached;
+my $memd = new Cache::Memcached {
+  'servers' => [ "127.0.0.1:11211" ]
+};
+print "Here the memcached results after delete:\n";
+$val = $memd->delete("F");
+$val = $memd->get("F");
+if ($val) { print "$val\n"; }
+$memd->disconnect_all;
+EOF
+
+# The following select is writing all to  memcache otherwisw memcache is empty.
+--sorted_result
+--error ER_TABLE_NOT_LOCKED
+SELECT c1,c2,c21 FROM t1;
+
+perl;
+use DBI;
+use Cache::Memcached;
+my $memd = new Cache::Memcached {
+  'servers' => [ "127.0.0.1:11211" ]
+};
+print "Here the memcached results after add Frankfurt|:\n";
+$val = $memd->add("F","Frankfurt|");
+$val = $memd->get("F");
+if ($val) { print "$val\n"; }
+print "Here the memcached results after add |Airport:\n";
+$val = $memd->add("F","|");
+$val = $memd->get("F");
+if ($val) { print "$val\n"; }
+$memd->disconnect_all;
+EOF
+
+# The following select is writing all to  memcache otherwisw memcache is empty.
+--sorted_result
+--error 1100
+SELECT c1,c2,c21 FROM t1;
+
+connection mysqltest1;
+UNLOCK TABLES;
+
+perl;
+use DBI;
+use Cache::Memcached;
+my $memd = new Cache::Memcached {
+  'servers' => [ "127.0.0.1:11211" ]
+};
+print "Here the memcached results after replace Frankfurt a.M.:\n";
+$val = $memd->replace("F","Frankfurt a. M.|");
+$val = $memd->get("F");
+if ($val) { print "$val\n"; }
+print "Here the memcached results after replace Sachsenhausen:\n";
+$val = $memd->replace("F","|Sachsenhausen");
+$val = $memd->get("F");
+if ($val) { print "$val\n"; }
+$memd->disconnect_all;
+EOF
+
+# The following select is writing all to  memcache otherwisw memcache is empty.
+--sorted_result
+SELECT c1,c2,c21 FROM t1;
+
+connection mysqltest1;
+DROP TABLE t1;
+DROP TABLE t2;
+connection default;
+disconnect mysqltest1;
+disconnect mysqltest2;
+DROP DATABASE innodb_memcache;
+DROP USER mysqltest1@localhost;
+DROP USER mysqltest2@localhost;
+ 
+SET @@global.tx_isolation= @tx_isolation;

=== added file 'mysql-test/suite/memcached/t/memcached_mdl-master.opt'
--- a/mysql-test/suite/memcached/t/memcached_mdl-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/memcached/t/memcached_mdl-master.opt	2012-02-20 16:29:18 +0000
@@ -0,0 +1,3 @@
+$DAEMON_MEMCACHED_OPT
+$DAEMON_MEMCACHED_LOAD
+--daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR

=== added file 'mysql-test/suite/memcached/t/memcached_mdl.test'
--- a/mysql-test/suite/memcached/t/memcached_mdl.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/memcached/t/memcached_mdl.test	2012-02-20 16:29:18 +0000
@@ -0,0 +1,225 @@
+CALL mtr.add_suppression("daemon-memcached-w-batch-size': unsigned");
+CALL mtr.add_suppression("Could not obtain server's UPN to be used as target service name");
+CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
+
+SET @tx_isolation= @@global.tx_isolation;
+SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+
+source include/have_innodb.inc;
+
+# Stop plugin befor innodb_memcached configuration
+UNINSTALL PLUGIN daemon_memcached;
+
+# Create the memcached tables
+--disable_query_log
+source suite/memcached/inc/memcache_config.inc;
+--enable_query_log
+
+INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
+				  "innodb_only", "innodb_only", "innodb_only");
+
+INSERT INTO config_options VALUES("separator", "|");
+
+# describe table for memcache
+INSERT INTO containers VALUES ("desc_t1", "test", "t1",
+			       "c1", "c2,c21", "c3", "c4", "c5", "PRIMARY");
+
+CREATE USER mysqltest1@localhost;
+CREATE USER mysqltest2@localhost;
+connect (mysqltest1,localhost,mysqltest1,,);
+connect (mysqltest2,localhost,mysqltest2,,);
+connection mysqltest1;
+USE test;
+
+CREATE TABLE t1        (c1 VARCHAR(32),
+			c2 VARCHAR(1024),
+			c21 VARCHAR(1024),
+			c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
+ENGINE = INNODB;
+
+CREATE TABLE t2        (c1 VARCHAR(32),
+			c2 VARCHAR(255),
+			c21 VARCHAR(255),
+			c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
+ENGINE = INNODB;
+
+INSERT INTO t1 VALUES ('D', 'Darmstadt', 'City', 0, 0, 0);
+INSERT INTO t1 VALUES ('B', 'Berlin', 'Mitte', 0, 0, 0);
+INSERT INTO t1 VALUES ('C', 'Cottbus', 'West', 0, 0 ,0);
+INSERT INTO t1 VALUES ('H', 'Hamburg', 'Norderstedt', 0, 0, 0);
+
+INSERT INTO t2 VALUES ('D', 'Darmstadt', 'City', 0, 0, 0);
+INSERT INTO t2 VALUES ('B', 'Berlin', 'Mitte', 0, 0, 0);
+INSERT INTO t2 VALUES ('C', 'Cottbus', 'West', 0, 0 ,0);
+INSERT INTO t2 VALUES ('H', 'Hamburg', 'Norderstedt', 0, 0, 0);
+
+# Tables must exist before plugin can be started!
+connection default;
+INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
+
+# The following select is writing all to  memcache otherwisw memcache is empty.
+connection mysqltest2;
+USE test;
+--sorted_result
+SELECT c1,c2,c21 FROM t1;
+
+connection mysqltest1;
+send DROP TABLE IF EXISTS t1;
+
+connection mysqltest2;
+perl;
+use DBI;
+use Cache::Memcached;
+my $memd = new Cache::Memcached {
+  'servers' => [ "127.0.0.1:11211" ]
+};
+print "Here the memcached results with D,B,H,C:\n";
+$val = $memd->get("D");
+if ($val) { print "$val\n"; }
+$val = $memd->get("B");
+if ($val) { print "$val\n"; }
+$val = $memd->get("H");
+if ($val) { print "$val\n"; }
+$val = $memd->get("C");
+if ($val) { print "$val\n"; }
+$memd->disconnect_all;
+EOF
+
+# The following select is writing all to  memcache otherwisw memcache is empty.
+--sorted_result
+SELECT c1,c2,c21 FROM t1;
+
+connection mysqltest1;
+reap;
+
+connection mysqltest2;
+perl;
+use DBI;
+use Cache::Memcached;
+my $memd = new Cache::Memcached {
+  'servers' => [ "127.0.0.1:11211" ]
+};
+print "Here the memcached results after set:\n";
+$val = $memd->set("E","Essen|Ost");
+$val = $memd->get("E");
+if ($val) { print "$val\n"; }
+$memd->disconnect_all;
+EOF
+
+# The following select is writing all to  memcache otherwisw memcache is empty.
+--sorted_result
+SELECT c1,c2,c21 FROM t1;
+
+connection mysqltest1;
+LOCK TABLES t2 WRITE;
+
+perl;
+use DBI;
+use Cache::Memcached;
+my $memd = new Cache::Memcached {
+  'servers' => [ "127.0.0.1:11211" ]
+};
+print "Here the memcached results after add:\n";
+$val = $memd->add("F","Frankfurt|Sachsenhause");
+$val = $memd->get("F");
+if ($val) { print "$val\n"; }
+$memd->disconnect_all;
+EOF
+
+# The following select is writing all to  memcache otherwisw memcache is empty.
+--sorted_result
+--error 1100
+SELECT c1,c2,c21 FROM t1;
+
+perl;
+use DBI;
+use Cache::Memcached;
+my $memd = new Cache::Memcached {
+  'servers' => [ "127.0.0.1:11211" ]
+};
+print "Here the memcached results after replace:\n";
+$val = $memd->replace("F","Frankfurt a. M.|Sachsenhausen");
+$val = $memd->get("F");
+if ($val) { print "$val\n"; }
+$memd->disconnect_all;
+EOF
+
+# The following select is writing all to  memcache otherwisw memcache is empty.
+--sorted_result
+--error 1100
+SELECT c1,c2,c21 FROM t1;
+
+perl;
+use DBI;
+use Cache::Memcached;
+my $memd = new Cache::Memcached {
+  'servers' => [ "127.0.0.1:11211" ]
+};
+print "Here the memcached results after delete:\n";
+$val = $memd->delete("F");
+$val = $memd->get("F");
+if ($val) { print "$val\n"; }
+$memd->disconnect_all;
+EOF
+
+# The following select is writing all to  memcache otherwisw memcache is empty.
+--sorted_result
+--error 1100
+SELECT c1,c2,c21 FROM t1;
+
+perl;
+use DBI;
+use Cache::Memcached;
+my $memd = new Cache::Memcached {
+  'servers' => [ "127.0.0.1:11211" ]
+};
+print "Here the memcached results after add Frankfurt|:\n";
+$val = $memd->add("F","Frankfurt|");
+$val = $memd->get("F");
+if ($val) { print "$val\n"; }
+print "Here the memcached results after add |Airport:\n";
+$val = $memd->add("F","|");
+$val = $memd->get("F");
+if ($val) { print "$val\n"; }
+$memd->disconnect_all;
+EOF
+
+# The following select is writing all to  memcache otherwisw memcache is empty.
+--sorted_result
+--error 1100
+SELECT c1,c2,c21 FROM t1;
+
+connection mysqltest1;
+UNLOCK TABLES;
+
+perl;
+use DBI;
+use Cache::Memcached;
+my $memd = new Cache::Memcached {
+  'servers' => [ "127.0.0.1:11211" ]
+};
+print "Here the memcached results after replace Frankfurt a.M.:\n";
+$val = $memd->replace("F","Frankfurt a. M.|");
+$val = $memd->get("F");
+if ($val) { print "$val\n"; }
+print "Here the memcached results after replace Sachsenhausen:\n";
+$val = $memd->replace("F","|Sachsenhausen");
+$val = $memd->get("F");
+if ($val) { print "$val\n"; }
+$memd->disconnect_all;
+EOF
+
+# The following select is writing all to  memcache otherwisw memcache is empty.
+--sorted_result
+SELECT c1,c2,c21 FROM t1;
+
+connection mysqltest1;
+DROP TABLE t1;
+connection default;
+disconnect mysqltest1;
+disconnect mysqltest2;
+DROP DATABASE innodb_memcache;
+DROP USER mysqltest1@localhost;
+DROP USER mysqltest2@localhost;
+ 
+SET @@global.tx_isolation= @tx_isolation;

=== modified file 'mysql-test/suite/memcached/t/memcached_replace-master.opt'
--- a/mysql-test/suite/memcached/t/memcached_replace-master.opt	2012-02-07 13:20:25 +0000
+++ b/mysql-test/suite/memcached/t/memcached_replace-master.opt	2012-02-20 16:29:18 +0000
@@ -1,2 +1,3 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
+--daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR

=== modified file 'mysql-test/suite/memcached/t/memcached_replace.test'
--- a/mysql-test/suite/memcached/t/memcached_replace.test	2012-02-07 13:20:25 +0000
+++ b/mysql-test/suite/memcached/t/memcached_replace.test	2012-02-20 16:29:18 +0000
@@ -11,7 +11,9 @@ source include/have_innodb.inc;
 UNINSTALL PLUGIN daemon_memcached;
 
 # Create the memcached tables
+--disable_query_log
 source suite/memcached/inc/memcache_config.inc;
+--enable_query_log
 
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 				  "innodb_only", "innodb_only", "innodb_only");

=== modified file 'mysql-test/suite/memcached/t/memcached_sep_1-master.opt'
--- a/mysql-test/suite/memcached/t/memcached_sep_1-master.opt	2012-02-16 08:35:09 +0000
+++ b/mysql-test/suite/memcached/t/memcached_sep_1-master.opt	2012-02-20 16:29:18 +0000
@@ -1,2 +1,3 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
+--daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR

=== modified file 'mysql-test/suite/memcached/t/memcached_sep_1.test'
--- a/mysql-test/suite/memcached/t/memcached_sep_1.test	2012-02-16 08:35:09 +0000
+++ b/mysql-test/suite/memcached/t/memcached_sep_1.test	2012-02-20 16:29:18 +0000
@@ -11,7 +11,9 @@ source include/have_innodb.inc;
 UNINSTALL PLUGIN daemon_memcached;
 
 # Create the memcached tables
+--disable_query_log
 source suite/memcached/inc/memcache_config.inc;
+--enable_query_log
 
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 				  "innodb_only", "innodb_only", "innodb_only");

=== modified file 'mysql-test/suite/memcached/t/memcached_sep_2-master.opt'
--- a/mysql-test/suite/memcached/t/memcached_sep_2-master.opt	2012-02-16 08:35:09 +0000
+++ b/mysql-test/suite/memcached/t/memcached_sep_2-master.opt	2012-02-20 16:29:18 +0000
@@ -1,2 +1,3 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
+--daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR

=== modified file 'mysql-test/suite/memcached/t/memcached_sep_2.test'
--- a/mysql-test/suite/memcached/t/memcached_sep_2.test	2012-02-16 08:35:09 +0000
+++ b/mysql-test/suite/memcached/t/memcached_sep_2.test	2012-02-20 16:29:18 +0000
@@ -11,7 +11,9 @@ source include/have_innodb.inc;
 UNINSTALL PLUGIN daemon_memcached;
 
 # Create the memcached tables
+--disable_query_log
 source suite/memcached/inc/memcache_config.inc;
+--enable_query_log
 
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 				  "innodb_only", "innodb_only", "innodb_only");

=== modified file 'mysql-test/suite/memcached/t/memcached_sep_3-master.opt'
--- a/mysql-test/suite/memcached/t/memcached_sep_3-master.opt	2012-02-16 08:35:09 +0000
+++ b/mysql-test/suite/memcached/t/memcached_sep_3-master.opt	2012-02-20 16:29:18 +0000
@@ -1,2 +1,3 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
+--daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR

=== modified file 'mysql-test/suite/memcached/t/memcached_sep_3.test'
--- a/mysql-test/suite/memcached/t/memcached_sep_3.test	2012-02-20 06:15:54 +0000
+++ b/mysql-test/suite/memcached/t/memcached_sep_3.test	2012-02-20 16:29:18 +0000
@@ -10,10 +10,12 @@ source include/have_innodb.inc;
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 
-set names utf8;
+#set names utf8;
 
 # Create the memcached tables
+--disable_query_log
 source suite/memcached/inc/memcache_config.inc;
+--enable_query_log
 
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 				  "innodb_only", "innodb_only", "innodb_only");

=== added file 'mysql-test/suite/memcached/t/memcached_sep_4-master.opt'
--- a/mysql-test/suite/memcached/t/memcached_sep_4-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/memcached/t/memcached_sep_4-master.opt	2012-02-20 16:29:18 +0000
@@ -0,0 +1,3 @@
+$DAEMON_MEMCACHED_OPT
+$DAEMON_MEMCACHED_LOAD
+--daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR

=== added file 'mysql-test/suite/memcached/t/memcached_sep_4.test'
--- a/mysql-test/suite/memcached/t/memcached_sep_4.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/memcached/t/memcached_sep_4.test	2012-02-20 16:29:18 +0000
@@ -0,0 +1,101 @@
+CALL mtr.add_suppression("daemon-memcached-w-batch-size': unsigned");
+CALL mtr.add_suppression("Could not obtain server's UPN to be used as target service name");
+CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
+
+SET @tx_isolation= @@global.tx_isolation;
+SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+
+source include/have_innodb.inc;
+
+# Stop plugin befor innodb_memcached configuration
+UNINSTALL PLUGIN daemon_memcached;
+
+# Create the memcached tables
+--disable_query_log
+source suite/memcached/inc/memcache_config.inc;
+--enable_query_log
+
+INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
+				  "innodb_only", "innodb_only", "innodb_only");
+
+INSERT INTO config_options VALUES("separator", "0");
+
+# describe table for memcache
+INSERT INTO containers VALUES ("desc_t1", "test", "t1",
+			       "c1", "c2,c21,c22,c23,c24,c25", "c3", "c4", "c5", "PRIMARY");
+
+USE test;
+
+CREATE TABLE t1        (c1 VARCHAR(32),
+			c2 VARCHAR(40),
+			c21 VARCHAR(40),
+			c22 VARCHAR(40),
+			c23 VARCHAR(40),
+			c24 VARCHAR(40),
+			c25 VARCHAR(40),
+			c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
+ENGINE = INNODB;
+
+INSERT INTO t1 VALUES ('D', 'Darmstadt', 'City','1', 'dddddddddddddd', '1234', '2012', 0, 0, 0);
+INSERT INTO t1 VALUES ('B', 'Berlin', 'Mitte', '0', 'bbbbbbbbbbbbbb', '2345', '2012', 0, 0, 0);
+INSERT INTO t1 VALUES ('C', 'Cottbus', 'West', '3', 'cccccccccccccc', '3456', '0', 0, 0 ,0);
+INSERT INTO t1 VALUES ('H', 'Hamburg', 'Norderstedt', '4', 'hhhhhhhhhh', '4567', '2012', 0, 0, 0);
+
+# Tables must exist before plugin can be started!
+INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
+
+# The following select is writing all to  memcache otherwisw memcache is empty.
+--sorted_result
+SELECT c1,c2,c21,c22,c23,c24,c25 FROM t1;
+
+perl;
+use DBI;
+use Cache::Memcached;
+my $memd = new Cache::Memcached {
+  'servers' => [ "127.0.0.1:11211" ]
+};
+print "Here the memcached results with D,B,H,C:\n";
+$val = $memd->get("D");
+if ($val) { print "$val\n"; }
+$val = $memd->get("B");
+if ($val) { print "$val\n"; }
+$val = $memd->get("H");
+if ($val) { print "$val\n"; }
+$val = $memd->get("C");
+if ($val) { print "$val\n"; }
+$memd->disconnect_all;
+EOF
+
+# The following select is writing all to  memcache otherwisw memcache is empty.
+--sorted_result
+SELECT c1,c2,c21,c22,c23,c24,c25 FROM t1;
+
+# Unload and reload the plugin for updating the options
+UNINSTALL PLUGIN daemon_memcached;
+UPDATE innodb_memcache.config_options SET value='|' WHERE name='separator';
+INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
+
+perl;
+use DBI;
+use Cache::Memcached;
+my $memd = new Cache::Memcached {
+  'servers' => [ "127.0.0.1:11211" ]
+};
+print "Here the memcached results after set:\n";
+$val = $memd->set("E","Essen|Ost|5|eeeeeeeeeee|5678|2012");
+$val = $memd->get("E");
+if ($val) { print "$val\n"; }
+#$val = $memd->set("E","Essen0Ost050eeeeeeeeeee0567802012");
+#$val = $memd->get("E");
+#if ($val) { print "$val\n"; }
+$memd->disconnect_all;
+EOF
+
+# The following select is writing all to  memcache otherwisw memcache is empty.
+--sorted_result
+SELECT c1,c2,c21,c22,c23,c24,c25 FROM t1;
+
+DROP TABLE t1;
+DROP DATABASE innodb_memcache;
+ 
+SET @@global.tx_isolation= @tx_isolation;

=== modified file 'mysql-test/suite/memcached/t/memcached_set-master.opt'
--- a/mysql-test/suite/memcached/t/memcached_set-master.opt	2012-02-07 13:20:25 +0000
+++ b/mysql-test/suite/memcached/t/memcached_set-master.opt	2012-02-20 16:29:18 +0000
@@ -1,2 +1,3 @@
 $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
+--daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR

=== modified file 'mysql-test/suite/memcached/t/memcached_set.test'
--- a/mysql-test/suite/memcached/t/memcached_set.test	2012-02-07 13:20:25 +0000
+++ b/mysql-test/suite/memcached/t/memcached_set.test	2012-02-20 16:29:18 +0000
@@ -9,9 +9,10 @@ source include/have_innodb.inc;
 
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
-
 # Create the memcached tables
+--disable_query_log
 source suite/memcached/inc/memcache_config.inc;
+--enable_query_log
 
 INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
 				  "innodb_only", "innodb_only", "innodb_only");

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-wl5824 branch (horst.hunger:3809 to 3810) WL#5824horst.hunger20 Feb