List:Commits« Previous MessageNext Message »
From:horst.hunger Date:February 16 2012 8:35am
Subject:bzr push into mysql-trunk-wl5824 branch (horst.hunger:3803 to 3804)
View as plain text  
 3804 horst.hunger@stripped	2012-02-16
      wl5824:more tests.

    added:
      mysql-test/suite/memcached/r/memcached_50_cols.result
      mysql-test/suite/memcached/r/memcached_5_cols.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/t/memcached_50_cols-master.opt
      mysql-test/suite/memcached/t/memcached_50_cols.test
      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_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
    modified:
      mysql-test/suite/memcached/r/memcached_2_intcols.result
      mysql-test/suite/memcached/t/memcached_2_intcols.test
 3803 Jimmy Yang	2012-02-15
      Refuse to start the InnoDB Memcached if the mapped "value" column is
      not of "character" type. Also enhance some error handling that gracefully
      deal with such error.

    modified:
      mysql-test/suite/memcached/r/memcached_2_intcols.result
      mysql-test/suite/memcached/t/memcached_2_intcols.test
      plugin/innodb_memcached/daemon_memcached/daemon/memcached.c
      plugin/innodb_memcached/innodb_memcache/src/innodb_config.c
=== modified file 'mysql-test/suite/memcached/r/memcached_2_intcols.result'
--- a/mysql-test/suite/memcached/r/memcached_2_intcols.result	2012-02-15 04:00:19 +0000
+++ b/mysql-test/suite/memcached/r/memcached_2_intcols.result	2012-02-16 08:35:09 +0000
@@ -38,14 +38,14 @@ INSERT INTO containers VALUES ("desc_t1"
 "c1", "c2,c21", "c3", "c4", "c5", "PRIMARY");
 USE test;
 CREATE TABLE t1        (c1 VARCHAR(32),
-c2 VARCHAR(5),
+c2 INT,
 c21 VARCHAR(1024),
 c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
 ENGINE = INNODB;
-INSERT INTO t1 VALUES ('D', '1', 'City', 0, 0, 0);
-INSERT INTO t1 VALUES ('B', '2', 'Mitte', 0, 0, 0);
-INSERT INTO t1 VALUES ('C', '3', 'West', 0, 0 ,0);
-INSERT INTO t1 VALUES ('H', '4', 'Norderstedt', 0, 0, 0);
+INSERT INTO t1 VALUES ('D', 1, 'City', 0, 0, 0);
+INSERT INTO t1 VALUES ('B', 2, 'Mitte', 0, 0, 0);
+INSERT INTO t1 VALUES ('C', 3, 'West', 0, 0 ,0);
+INSERT INTO t1 VALUES ('H', 4, 'Norderstedt', 0, 0, 0);
 INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
 SELECT c1,c2,c21 FROM t1;
 c1	c2	c21
@@ -54,10 +54,6 @@ C	3	West
 D	1	City
 H	4	Norderstedt
 Here the memcached results with D,B,H,C:
-1|City
-2|Mitte
-4|Norderstedt
-3|West
 SELECT c1,c2,c21 FROM t1;
 c1	c2	c21
 B	2	Mitte
@@ -65,65 +61,11 @@ C	3	West
 D	1	City
 H	4	Norderstedt
 Here the memcached results after set:
-5|Ost
 SELECT c1,c2,c21 FROM t1;
 c1	c2	c21
 B	2	Mitte
 C	3	West
 D	1	City
-E	5	Ost
-H	4	Norderstedt
-Here the memcached results after add:
-6|Sachsenhause
-SELECT c1,c2,c21 FROM t1;
-c1	c2	c21
-B	2	Mitte
-C	3	West
-D	1	City
-E	5	Ost
-F	6	Sachsenhause
-H	4	Norderstedt
-Here the memcached results after replace:
-61|Sachsenhausen
-SELECT c1,c2,c21 FROM t1;
-c1	c2	c21
-B	2	Mitte
-C	3	West
-D	1	City
-E	5	Ost
-F	61	Sachsenhausen
-H	4	Norderstedt
-Here the memcached results after delete:
-SELECT c1,c2,c21 FROM t1;
-c1	c2	c21
-B	2	Mitte
-C	3	West
-D	1	City
-E	5	Ost
-H	4	Norderstedt
-Here the memcached results after add Frankfurt|:
-6|a
-Here the memcached results after add |Airport:
-6|a
-SELECT c1,c2,c21 FROM t1;
-c1	c2	c21
-B	2	Mitte
-C	3	West
-D	1	City
-E	5	Ost
-F	6	a
-H	4	Norderstedt
-Here the memcached results after replace Frankfurt a.M.:
-61|s
-Here the memcached results after replace Sachsenhausen:
-Sachsenhausen
-SELECT c1,c2,c21 FROM t1;
-c1	c2	c21
-B	2	Mitte
-C	3	West
-D	1	City
-E	5	Ost
-F	NULL	Sachsenhausen
 H	4	Norderstedt
 DROP TABLE t1;
 DROP DATABASE innodb_memcache;

=== added file 'mysql-test/suite/memcached/r/memcached_50_cols.result'
--- a/mysql-test/suite/memcached/r/memcached_50_cols.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/memcached/r/memcached_50_cols.result	2012-02-16 08:35:09 +0000
@@ -0,0 +1,111 @@
+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;
+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", "|");
+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:
+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
+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
+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
+H	Hamburg	Norderstedt	4	hhhhhhhhhh	4567	2012
+Here the memcached results after add:
+Frankfurt|Airport|6|fffffffffff|6789|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
+F	Frankfurt	Airport	6	fffffffffff	6789	2012
+H	Hamburg	Norderstedt	4	hhhhhhhhhh	4567	2012
+Here the memcached results after replace:
+Frankfurt a.M.|Sachsenhausen|61|fffff|6789|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
+F	Frankfurt a.M.	Sachsenhausen	61	fffff	6789	2012
+H	Hamburg	Norderstedt	4	hhhhhhhhhh	4567	2012
+Here the memcached results after delete:
+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
+H	Hamburg	Norderstedt	4	hhhhhhhhhh	4567	2012
+DROP TABLE t1;
+DROP DATABASE innodb_memcache;
+SET @@global.tx_isolation= @tx_isolation;

=== added file 'mysql-test/suite/memcached/r/memcached_5_cols.result'
--- a/mysql-test/suite/memcached/r/memcached_5_cols.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/memcached/r/memcached_5_cols.result	2012-02-16 08:35:09 +0000
@@ -0,0 +1,111 @@
+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;
+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", "|");
+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:
+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
+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
+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
+H	Hamburg	Norderstedt	4	hhhhhhhhhh	4567	2012
+Here the memcached results after add:
+Frankfurt|Airport|6|fffffffffff|6789|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
+F	Frankfurt	Airport	6	fffffffffff	6789	2012
+H	Hamburg	Norderstedt	4	hhhhhhhhhh	4567	2012
+Here the memcached results after replace:
+Frankfurt a.M.|Sachsenhausen|61|fffff|6789|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
+F	Frankfurt a.M.	Sachsenhausen	61	fffff	6789	2012
+H	Hamburg	Norderstedt	4	hhhhhhhhhh	4567	2012
+Here the memcached results after delete:
+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
+H	Hamburg	Norderstedt	4	hhhhhhhhhh	4567	2012
+DROP TABLE t1;
+DROP DATABASE innodb_memcache;
+SET @@global.tx_isolation= @tx_isolation;

=== added file 'mysql-test/suite/memcached/r/memcached_sep_1.result'
--- a/mysql-test/suite/memcached/r/memcached_sep_1.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/memcached/r/memcached_sep_1.result	2012-02-16 08:35:09 +0000
@@ -0,0 +1,83 @@
+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;
+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");
+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;

=== added file 'mysql-test/suite/memcached/r/memcached_sep_2.result'
--- a/mysql-test/suite/memcached/r/memcached_sep_2.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/memcached/r/memcached_sep_2.result	2012-02-16 08:35:09 +0000
@@ -0,0 +1,83 @@
+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;
+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", "+++");
+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:
+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
+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
+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
+H	Hamburg	Norderstedt	4	hhhhhhhhhh	4567	2012
+DROP TABLE t1;
+DROP DATABASE innodb_memcache;
+SET @@global.tx_isolation= @tx_isolation;

=== added file 'mysql-test/suite/memcached/r/memcached_sep_3.result'
--- a/mysql-test/suite/memcached/r/memcached_sep_3.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/memcached/r/memcached_sep_3.result	2012-02-16 08:35:09 +0000
@@ -0,0 +1,83 @@
+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;
+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");
+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/t/memcached_2_intcols.test'
--- a/mysql-test/suite/memcached/t/memcached_2_intcols.test	2012-02-15 04:00:19 +0000
+++ b/mysql-test/suite/memcached/t/memcached_2_intcols.test	2012-02-16 08:35:09 +0000
@@ -25,15 +25,15 @@ INSERT INTO containers VALUES ("desc_t1"
 USE test;
 
 CREATE TABLE t1        (c1 VARCHAR(32),
-			c2 VARCHAR(5),
+			c2 INT,
 			c21 VARCHAR(1024),
 			c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
 ENGINE = INNODB;
 
-INSERT INTO t1 VALUES ('D', '1', 'City', 0, 0, 0);
-INSERT INTO t1 VALUES ('B', '2', 'Mitte', 0, 0, 0);
-INSERT INTO t1 VALUES ('C', '3', 'West', 0, 0 ,0);
-INSERT INTO t1 VALUES ('H', '4', 'Norderstedt', 0, 0, 0);
+INSERT INTO t1 VALUES ('D', 1, 'City', 0, 0, 0);
+INSERT INTO t1 VALUES ('B', 2, 'Mitte', 0, 0, 0);
+INSERT INTO t1 VALUES ('C', 3, 'West', 0, 0 ,0);
+INSERT INTO t1 VALUES ('H', 4, 'Norderstedt', 0, 0, 0);
 
 # Tables must exist before plugin can be started!
 INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
@@ -76,99 +76,6 @@ $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;
-
-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","6|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
-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","61|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;
-
-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
-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","6|a");
-$val = $memd->get("F");
-if ($val) { print "$val\n"; }
-print "Here the memcached results after add |Airport:\n";
-$val = $memd->add("F","|Airport");
-$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;
-
-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","61|s");
-$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

=== added file 'mysql-test/suite/memcached/t/memcached_50_cols-master.opt'
--- a/mysql-test/suite/memcached/t/memcached_50_cols-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/memcached/t/memcached_50_cols-master.opt	2012-02-16 08:35:09 +0000
@@ -0,0 +1,2 @@
+$DAEMON_MEMCACHED_OPT
+$DAEMON_MEMCACHED_LOAD

=== added file 'mysql-test/suite/memcached/t/memcached_50_cols.test'
--- a/mysql-test/suite/memcached/t/memcached_50_cols.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/memcached/t/memcached_50_cols.test	2012-02-16 08:35:09 +0000
@@ -0,0 +1,176 @@
+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
+source suite/memcached/inc/memcache_config.inc;
+
+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", 
+                               "c200,c201,c202,c203,c204,c205,c206,c207,c208,c209,
+                                c210,c211,c212,c213,c214,c215,c216,c217,c218,c219,
+                                c220,c221,c222,c223,c224,c225,c226,c227,c228,c229,
+                                c230,c231,c232,c233,c234,c235,c236,c237,c238,c239,
+                                c240,c241,c242,c243,c244,c245,c246,c247,c248,c249", 
+                               "c3", "c4", "c5", "PRIMARY");
+
+USE test;
+
+CREATE TABLE t1        (c1 VARCHAR(32),
+			c200 VARCHAR(40),
+			c201 VARCHAR(40),
+			c202 VARCHAR(40),
+			c203 VARCHAR(40),
+			c204 VARCHAR(40),
+			c205 VARCHAR(40),
+			c206 VARCHAR(40),
+			c207 VARCHAR(40),
+			c208 VARCHAR(40),
+			c209 VARCHAR(40),
+			c210 VARCHAR(40),
+			c211 VARCHAR(40),
+			c212 VARCHAR(40),
+			c213 VARCHAR(40),
+			c214 VARCHAR(40),
+			c215 VARCHAR(40),
+			c216 VARCHAR(40),
+			c217 VARCHAR(40),
+			c218 VARCHAR(40),
+			c219 VARCHAR(40),
+			c220 VARCHAR(40),
+			c221 VARCHAR(40),
+			c222 VARCHAR(40),
+			c223 VARCHAR(40),
+			c224 VARCHAR(40),
+			c225 VARCHAR(40),
+			c226 VARCHAR(40),
+			c227 VARCHAR(40),
+			c228 VARCHAR(40),
+			c229 VARCHAR(40),
+			c230 VARCHAR(40),
+			c231 VARCHAR(40),
+			c232 VARCHAR(40),
+			c233 VARCHAR(40),
+			c234 VARCHAR(40),
+			c235 VARCHAR(40),
+			c236 VARCHAR(40),
+			c237 VARCHAR(40),
+			c238 VARCHAR(40),
+			c239 VARCHAR(40),
+			c240 VARCHAR(40),
+			c241 VARCHAR(40),
+			c242 VARCHAR(40),
+			c243 VARCHAR(40),
+			c244 VARCHAR(40),
+			c245 VARCHAR(40),
+			c246 VARCHAR(40),
+			c247 VARCHAR(40),
+			c248 VARCHAR(40),
+			c249 VARCHAR(40),
+			c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
+ENGINE = INNODB;
+
+INSERT INTO t1 VALUES ('1',
+                       'c200','c201','c202','c203','c204','c205','c206','c207','c208','c209',
+                       'c210','c211','c212','c213','c214','c215','c216','c217','c218','c219',
+                       'c220','c221','c222','c223','c224','c225','c226','c227','c228','c229',
+                       'c230','c231','c232','c233','c234','c235','c236','c237','c238','c239',
+                       'c240','c241','c242','c243','c244','c245','c246','c247','c248','c249', 
+                       0, 0, 0);
+INSERT INTO t1 VALUES ('2',
+                       'c200','c201','c202','c203','c204','c205','c206','c207','c208','c209',
+                       'c210','c211','c212','c213','c214','c215','c216','c217','c218','c219',
+                       'c220','c221','c222','c223','c224','c225','c226','c227','c228','c229',
+                       'c230','c231','c232','c233','c234','c235','c236','c237','c238','c239',
+                       'c240','c241','c242','c243','c244','c245','c246','c247','c248','c249', 
+                       0, 0, 0);
+INSERT INTO t1 VALUES ('3',
+                       'c200','c201','c202','c203','c204','c205','c206','c207','c208','c209',
+                       'c210','c211','c212','c213','c214','c215','c216','c217','c218','c219',
+                       'c220','c221','c222','c223','c224','c225','c226','c227','c228','c229',
+                       'c230','c231','c232','c233','c234','c235','c236','c237','c238','c239',
+                       'c240','c241','c242','c243','c244','c245','c246','c247','c248','c249', 
+                       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,c200,c201,c202,c203,c204,c205,c206,c207,c208,c209,
+          c210,c211,c212,c213,c214,c215,c216,c217,c218,c219,
+          c220,c221,c222,c223,c224,c225,c226,c227,c228,c229,
+          c230,c231,c232,c233,c234,c235,c236,c237,c238,c239,
+          c240,c241,c242,c243,c244,c245,c246,c247,c248,c249
+       FROM t1; 
+
+perl;
+use DBI;
+use Cache::Memcached;
+my $memd = new Cache::Memcached {
+  'servers' => [ "127.0.0.1:11211" ]
+};
+print "Here the memcached results:\n";
+$val = $memd->get("1");
+if ($val) { print "$val\n"; }
+$val = $memd->get("2");
+if ($val) { print "$val\n"; }
+$val = $memd->get("3");
+if ($val) { print "$val\n"; }
+$memd->disconnect_all;
+EOF
+
+# The following select is writing all to  memcache otherwise memcache is empty.
+--sorted_result
+SELECT c1,c200,c201,c202,c203,c204,c205,c206,c207,c208,c209,
+          c210,c211,c212,c213,c214,c215,c216,c217,c218,c219,
+          c220,c221,c222,c223,c224,c225,c226,c227,c228,c229,
+          c230,c231,c232,c233,c234,c235,c236,c237,c238,c239,
+          c240,c241,c242,c243,c244,c245,c246,c247,c248,c249
+       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("4","c200,c201,c202,c203,c204,c205,c206,c207,c208,c209,
+                       c210,c211,c212,c213,c214,c215,c216,c217,c218,c219,
+                       c220,c221,c222,c223,c224,c225,c226,c227,c228,c229,
+                       c230,c231,c232,c233,c234,c235,c236,c237,c238,c239,
+                       c240,c241,c242,c243,c244,c245,c246,c247,c248,c249"
+                 ); 
+$val = $memd->get("4");
+if ($val) { print "$val\n"; }
+$memd->disconnect_all;
+EOF
+
+# The following select is writing all to  memcache otherwise memcache is empty.
+--sorted_result
+SELECT c1,c200,c201,c202,c203,c204,c205,c206,c207,c208,c209,
+          c210,c211,c212,c213,c214,c215,c216,c217,c218,c219,
+          c220,c221,c222,c223,c224,c225,c226,c227,c228,c229,
+          c230,c231,c232,c233,c234,c235,c236,c237,c238,c239,
+          c240,c241,c242,c243,c244,c245,c246,c247,c248,c249
+       FROM t1; 
+
+DROP TABLE t1;
+DROP DATABASE innodb_memcache;
+ 
+SET @@global.tx_isolation= @tx_isolation;

=== added file 'mysql-test/suite/memcached/t/memcached_5_cols-master.opt'
--- a/mysql-test/suite/memcached/t/memcached_5_cols-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/memcached/t/memcached_5_cols-master.opt	2012-02-16 08:35:09 +0000
@@ -0,0 +1,2 @@
+$DAEMON_MEMCACHED_OPT
+$DAEMON_MEMCACHED_LOAD

=== added file 'mysql-test/suite/memcached/t/memcached_5_cols.test'
--- a/mysql-test/suite/memcached/t/memcached_5_cols.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/memcached/t/memcached_5_cols.test	2012-02-16 08:35:09 +0000
@@ -0,0 +1,144 @@
+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
+source suite/memcached/inc/memcache_config.inc;
+
+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', '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);
+
+# 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|Ost|5|eeeeeeeeeee|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|6|fffffffffff|6789|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|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 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;

=== added file 'mysql-test/suite/memcached/t/memcached_sep_1-master.opt'
--- a/mysql-test/suite/memcached/t/memcached_sep_1-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/memcached/t/memcached_sep_1-master.opt	2012-02-16 08:35:09 +0000
@@ -0,0 +1,2 @@
+$DAEMON_MEMCACHED_OPT
+$DAEMON_MEMCACHED_LOAD

=== added file 'mysql-test/suite/memcached/t/memcached_sep_1.test'
--- a/mysql-test/suite/memcached/t/memcached_sep_1.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/memcached/t/memcached_sep_1.test	2012-02-16 08:35:09 +0000
@@ -0,0 +1,94 @@
+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
+source suite/memcached/inc/memcache_config.inc;
+
+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', '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);
+
+# 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|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;

=== added file 'mysql-test/suite/memcached/t/memcached_sep_2-master.opt'
--- a/mysql-test/suite/memcached/t/memcached_sep_2-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/memcached/t/memcached_sep_2-master.opt	2012-02-16 08:35:09 +0000
@@ -0,0 +1,2 @@
+$DAEMON_MEMCACHED_OPT
+$DAEMON_MEMCACHED_LOAD

=== added file 'mysql-test/suite/memcached/t/memcached_sep_2.test'
--- a/mysql-test/suite/memcached/t/memcached_sep_2.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/memcached/t/memcached_sep_2.test	2012-02-16 08:35:09 +0000
@@ -0,0 +1,94 @@
+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
+source suite/memcached/inc/memcache_config.inc;
+
+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', '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);
+
+# 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|Ost|5|eeeeeeeeeee|5678|2012");
+$val = $memd->get("E");
+if ($val) { print "$val\n"; }
+$val = $memd->set("E","Essen+++Ost+++5+++eeeeeeeeeee+++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;
+
+DROP TABLE t1;
+DROP DATABASE innodb_memcache;
+ 
+SET @@global.tx_isolation= @tx_isolation;

=== added file 'mysql-test/suite/memcached/t/memcached_sep_3-master.opt'
--- a/mysql-test/suite/memcached/t/memcached_sep_3-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/memcached/t/memcached_sep_3-master.opt	2012-02-16 08:35:09 +0000
@@ -0,0 +1,2 @@
+$DAEMON_MEMCACHED_OPT
+$DAEMON_MEMCACHED_LOAD

=== added file 'mysql-test/suite/memcached/t/memcached_sep_3.test'
--- a/mysql-test/suite/memcached/t/memcached_sep_3.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/memcached/t/memcached_sep_3.test	2012-02-16 08:35:09 +0000
@@ -0,0 +1,94 @@
+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
+source suite/memcached/inc/memcache_config.inc;
+
+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', '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);
+
+# 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|Ost|5|eeeeeeeeeee|5678|2012");
+$val = $memd->get("E");
+if ($val) { print "$val\n"; }
+$val = $memd->set("E","Essen");
+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;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-wl5824 branch (horst.hunger:3803 to 3804) horst.hunger16 Feb