List:Commits« Previous MessageNext Message »
From:horst.hunger Date:May 24 2012 1:19pm
Subject:bzr push into mysql-trunk-wl6218 branch (horst.hunger:3870 to 3871)
View as plain text  
 3871 horst.hunger@stripped	2012-05-24
      for another gcov run.

    modified:
      mysql-test/suite/memcached/r/memc224_index_2.result
      mysql-test/suite/memcached/r/memc273_5_tables.result
      mysql-test/suite/memcached/r/memc275_5_tables_index.result
      mysql-test/suite/memcached/t/memc224_index_2.test
      mysql-test/suite/memcached/t/memc273_5_tables.test
      mysql-test/suite/memcached/t/memc275_5_tables_index.test
 3870 horst.hunger@stripped	2012-05-24
      For code coverage.

    modified:
      mysql-test/suite/memcached/r/memc224_index_2.result
      mysql-test/suite/memcached/r/memc225_index_3.result
      mysql-test/suite/memcached/r/memc272_2_tables.result
      mysql-test/suite/memcached/r/memc273_5_tables.result
      mysql-test/suite/memcached/r/memc274_5_tables_uml.result
      mysql-test/suite/memcached/r/memc275_5_tables_index.result
      mysql-test/suite/memcached/r/memc276_1_table.result
      mysql-test/suite/memcached/r/memc277_default_table.result
      mysql-test/suite/memcached/r/memc278_view.result
      mysql-test/suite/memcached/t/memc272_2_tables-master.opt
      mysql-test/suite/memcached/t/memc272_2_tables.test
      mysql-test/suite/memcached/t/memc273_5_tables-master.opt
      mysql-test/suite/memcached/t/memc273_5_tables.test
      mysql-test/suite/memcached/t/memc274_5_tables_uml-master.opt
      mysql-test/suite/memcached/t/memc274_5_tables_uml.test
      mysql-test/suite/memcached/t/memc275_5_tables_index-master.opt
      mysql-test/suite/memcached/t/memc275_5_tables_index.test
      mysql-test/suite/memcached/t/memc276_1_table-master.opt
      mysql-test/suite/memcached/t/memc276_1_table.test
      mysql-test/suite/memcached/t/memc277_default_table-master.opt
      mysql-test/suite/memcached/t/memc277_default_table.test
      mysql-test/suite/memcached/t/memc278_view-master.opt
      mysql-test/suite/memcached/t/memc278_view.test
=== modified file 'mysql-test/suite/memcached/r/memc224_index_2.result'
--- a/mysql-test/suite/memcached/r/memc224_index_2.result	2012-05-24 09:10:25 +0000
+++ b/mysql-test/suite/memcached/r/memc224_index_2.result	2012-05-24 13:18:23 +0000
@@ -5,7 +5,7 @@ INSERT INTO cache_policies VALUES("cache
 "innodb_only", "innodb_only", "innodb_only");
 INSERT INTO config_options VALUES("separator", "|");
 INSERT INTO containers VALUES ("desc_t1", "test", "t1",
-"c11", "c2,c21", "c3", "c4", "c5", "PRIMARY");
+"c1", "c2,c21", "c3", "c4", "c5", "PRIMARY");
 CREATE USER mysqltest1@localhost;
 connect  mysqltest1,localhost,mysqltest1,,;
 connection mysqltest1;
@@ -15,33 +15,8 @@ CREATE TABLE t1        (c1  VARCHAR(32),
 c11 VARCHAR(32),
 c2  VARCHAR(1024),
 c21 VARCHAR(1024),
-c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1,c11))
-ENGINE = INNODB;
-DROP TABLE IF EXISTS t2;
-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','D', 'Darmstadt', 'City', 0, 0, 0);
-INSERT INTO t1 VALUES ('B','B', 'Berlin', 'Mitte', 0, 0, 0);
-INSERT INTO t1 VALUES ('C','C', 'Cottbus', 'West', 0, 0 ,0);
-INSERT INTO t1 VALUES ('H','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);
-connection default;
-INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
-UNINSTALL PLUGIN daemon_memcached;
-connection mysqltest1;
-USE test;
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1        (c1  VARCHAR(32),
-c11 VARCHAR(32),
-c2  VARCHAR(1024),
-c21 VARCHAR(1024),
-c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1));
+c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1)) 
+ENGINE=INNODB;
 INSERT INTO t1 VALUES ('D','D', 'Darmstadt', 'City', 0, 0, 0);
 INSERT INTO t1 VALUES ('B','B', 'Berlin', 'Mitte', 0, 0, 0);
 INSERT INTO t1 VALUES ('C','C', 'Cottbus', 'West', 0, 0 ,0);
@@ -57,6 +32,10 @@ C	C	Cottbus	West
 D	D	Darmstadt	City
 H	H	Hamburg	Norderstedt
 Here the memcached results with D,B,H,C:
+Darmstadt|City
+Berlin|Mitte
+Hamburg|Norderstedt
+Cottbus|West
 SELECT c1,c11,c2,c21 FROM t1;
 c1	c11	c2	c21
 B	B	Berlin	Mitte
@@ -64,25 +43,33 @@ C	C	Cottbus	West
 D	D	Darmstadt	City
 H	H	Hamburg	Norderstedt
 Here the memcached results after set:
+Essen|Ost
 SELECT c1,c11,c2,c21 FROM t1;
 c1	c11	c2	c21
 B	B	Berlin	Mitte
 C	C	Cottbus	West
 D	D	Darmstadt	City
+E	NULL	Essen	Ost
 H	H	Hamburg	Norderstedt
 Here the memcached results after add:
+Frankfurt|Sachsenhause
 SELECT c1,c11,c2,c21 FROM t1;
 c1	c11	c2	c21
 B	B	Berlin	Mitte
 C	C	Cottbus	West
 D	D	Darmstadt	City
+E	NULL	Essen	Ost
+F	NULL	Frankfurt	Sachsenhause
 H	H	Hamburg	Norderstedt
 Here the memcached results after replace:
+Frankfurt a. M.|Sachsenhausen
 SELECT c1,c11,c2,c21 FROM t1;
 c1	c11	c2	c21
 B	B	Berlin	Mitte
 C	C	Cottbus	West
 D	D	Darmstadt	City
+E	NULL	Essen	Ost
+F	NULL	Frankfurt a. M.	Sachsenhausen
 H	H	Hamburg	Norderstedt
 Here the memcached results after delete:
 SELECT c1,c11,c2,c21 FROM t1;
@@ -90,20 +77,27 @@ c1	c11	c2	c21
 B	B	Berlin	Mitte
 C	C	Cottbus	West
 D	D	Darmstadt	City
+E	NULL	Essen	Ost
 H	H	Hamburg	Norderstedt
 Here the memcached results after add Frankfurt|Airport:
+Frankfurt|Airport
 SELECT c1,c11,c2,c21 FROM t1;
 c1	c11	c2	c21
 B	B	Berlin	Mitte
 C	C	Cottbus	West
 D	D	Darmstadt	City
+E	NULL	Essen	Ost
+F	NULL	Frankfurt	Airport
 H	H	Hamburg	Norderstedt
 Here the memcached results after replace Frankfurt a.M|Sachsenhausen.:
+Frankfurt a. M.|Sachsenhausen
 SELECT c1,c11,c2,c21 FROM t1;
 c1	c11	c2	c21
 B	B	Berlin	Mitte
 C	C	Cottbus	West
 D	D	Darmstadt	City
+E	NULL	Essen	Ost
+F	NULL	Frankfurt a. M.	Sachsenhausen
 H	H	Hamburg	Norderstedt
 connection default;
 UNINSTALL PLUGIN daemon_memcached;
@@ -116,35 +110,43 @@ c1	c11	c2	c21
 B	B	Berlin	Mitte
 C	C	Cottbus	West
 D	D	Darmstadt	City
+E	NULL	Essen	Ost
+F	NULL	Frankfurt a. M.	Sachsenhausen
 H	H	Hamburg	Norderstedt
 connection default;
 UNINSTALL PLUGIN daemon_memcached;
-ALTER TABLE test.t1 ADD CONSTRAINT PRIMARY KEY (c11);
+ALTER TABLE test.t1 ADD CONSTRAINT PRIMARY KEY (c1);
 INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
 SHOW CREATE TABLE test.t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varchar(32) NOT NULL DEFAULT '',
-  `c11` varchar(32) NOT NULL DEFAULT '',
+  `c11` varchar(32) DEFAULT NULL,
   `c2` varchar(1024) DEFAULT NULL,
   `c21` varchar(1024) DEFAULT NULL,
   `c3` int(11) DEFAULT NULL,
   `c4` bigint(20) unsigned DEFAULT NULL,
   `c5` int(11) DEFAULT NULL,
-  PRIMARY KEY (`c11`)
+  PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 connection mysqltest1;
 Here the memcached results after set:
+Essen|Ost
+Frankfurt a. M.|Sachsenhausen
 Hamburg|Norderstedt
 SELECT c1,c11,c2,c21 FROM t1;
 c1	c11	c2	c21
 B	B	Berlin	Mitte
 C	C	Cottbus	West
 D	D	Darmstadt	City
+E	NULL	Essen	Ost
+F	NULL	Frankfurt a. M.	Sachsenhausen
 H	H	Hamburg	Norderstedt
 connection default;
 UNINSTALL PLUGIN daemon_memcached;
 ALTER TABLE test.t1 DROP COLUMN c1;
+UPDATE innodb_memcache.containers set key_columns = "c11", unique_idx_name_on_key="idx";
+create unique index idx on test.t1(c11);
 INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
 connection mysqltest1;
 Here the memcached results after add:
@@ -159,8 +161,9 @@ D	Darmstadt	City
 E	Essen	Ost
 F	Frankfurt	Sachsenhause
 H	Hamburg	Norderstedt
+NULL	Essen	Ost
+NULL	Frankfurt a. M.	Sachsenhausen
 DROP TABLE t1;
-DROP TABLE t2;
 connection default;
 disconnect mysqltest1;
 DROP DATABASE innodb_memcache;

=== modified file 'mysql-test/suite/memcached/r/memc273_5_tables.result'
--- a/mysql-test/suite/memcached/r/memc273_5_tables.result	2012-05-24 09:10:25 +0000
+++ b/mysql-test/suite/memcached/r/memc273_5_tables.result	2012-05-24 13:18:23 +0000
@@ -1,7 +1,3 @@
-select * FROM INFORMATION_SCHEMA.PLUGINS
-WHERE PLUGIN_NAME='daemon_memcached';
-PLUGIN_NAME	PLUGIN_VERSION	PLUGIN_STATUS	PLUGIN_TYPE	PLUGIN_TYPE_VERSION	PLUGIN_LIBRARY	PLUGIN_LIBRARY_VERSION	PLUGIN_AUTHOR	PLUGIN_DESCRIPTION	PLUGIN_LICENSE	LOAD_OPTION
-daemon_memcached	1.0	ACTIVE	DAEMON	50606.0	libmemcached.so	1.3	Oracle Corporation	Memcached Daemon	GPL	ON
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 UNINSTALL PLUGIN daemon_memcached;

=== modified file 'mysql-test/suite/memcached/r/memc275_5_tables_index.result'
--- a/mysql-test/suite/memcached/r/memc275_5_tables_index.result	2012-05-24 09:10:25 +0000
+++ b/mysql-test/suite/memcached/r/memc275_5_tables_index.result	2012-05-24 13:18:23 +0000
@@ -8,9 +8,9 @@ INSERT INTO config_options VALUES("table
 INSERT INTO containers VALUES ("desct1", "test", "t1",
 "c1", "c2,c21", "c3", "c4", "c5", "PRIMARY");
 INSERT INTO containers VALUES ("desct2", "test", "t2",
-"c1", "c11,c2", "c3", "c4", "c5", "it2c11");
+"c11", "c1,c2", "c3", "c4", "c5", "it2c11");
 INSERT INTO containers VALUES ("desct3", "test", "t3",
-"c1", "c2,c21", "c3", "c4", "c5", "it3c21");
+"c21", "c2,c1", "c3", "c4", "c5", "it3c21");
 INSERT INTO containers VALUES ("desct4", "test", "t4",
 "c1", "c2,c21,c22", "c3", "c4", "c5", "PRIMARY");
 INSERT INTO containers VALUES ("desct5", "test", "t5",
@@ -109,7 +109,15 @@ Berlin|Mitte
 Hamburg|Norderstedt
 Cottbus|West
 Here the memcached results with D,B,H,C of t2:
+D|Dortmund
+B|Bremen
+H|Hannover
+C|Celle
 Here the memcached results with D,B,H,A of t3:
+Detmold|D
+Aachen|A
+Bonn|B
+Hameln|H
 Here the memcached results with D,O,K,S of t5:
 Duesseldorf|City|98765|Hafen
 Oldenburg|Mitte|87654|Deich
@@ -121,8 +129,6 @@ Brandenburg|Mitte|23456
 Husum|Nord|45678
 Muenchen|West|34567
 Here the memcached results with D,B,H,C of t2:
-Brandenburg|Mitte|23456
-Husum|Nord|45678
 SELECT c1,c2,c21 FROM t1;
 c1	c2	c21
 B	Berlin	Mitte
@@ -156,9 +162,11 @@ S	Stuttgart	Nord	65432	Fernsehturm
 Here the memcached results after set in default:
 Essen|Ost
 Here the memcached results after set in t2:
+Es|Essen
 Here the memcached results after set in t5:
 Essen|Mitte|111111|Mahlzeit
 Here the memcached results after set in t3:
+Essen|Ost
 Here the memcached results after set in t4:
 Essen|Mitte|111111
 Here the memcached results after set in t5:
@@ -175,6 +183,7 @@ c1	c2
 B	Bremen
 C	Celle
 D	Dortmund
+Es	Essen
 H	Hannover
 SELECT c1,c2,c21 FROM t3;
 c1	c2	c21
@@ -182,6 +191,7 @@ A	Aachen	West
 B	Bonn	Mitte
 D	Detmold	City
 H	Hameln	Nord
+Ost	Essen	E
 SELECT c1,c2,c21,c22 FROM t4;
 c1	c2	c21	c22
 B	Brandenburg	Mitte	23456

=== modified file 'mysql-test/suite/memcached/t/memc224_index_2.test'
--- a/mysql-test/suite/memcached/t/memc224_index_2.test	2012-05-23 17:55:09 +0000
+++ b/mysql-test/suite/memcached/t/memc224_index_2.test	2012-05-24 13:18:23 +0000
@@ -27,7 +27,7 @@ INSERT INTO cache_policies VALUES("cache
 INSERT INTO config_options VALUES("separator", "|");
 
 INSERT INTO containers VALUES ("desc_t1", "test", "t1",
-			       "c11", "c2,c21", "c3", "c4", "c5", "PRIMARY");
+			       "c1", "c2,c21", "c3", "c4", "c5", "PRIMARY");
 
 CREATE USER mysqltest1@localhost;
 connect (mysqltest1,localhost,mysqltest1,,);
@@ -41,52 +41,16 @@ CREATE TABLE t1        (c1  VARCHAR(32),
                         c11 VARCHAR(32),
 			c2  VARCHAR(1024),
 			c21 VARCHAR(1024),
-			c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1,c11))
-ENGINE = INNODB;
-
---disable_warnings
-DROP TABLE IF EXISTS t2;
---enable_warnings
-CREATE TABLE t2        (c1 VARCHAR(32),
-			c2 VARCHAR(255),
-			c21 VARCHAR(255),
-			c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
-ENGINE = INNODB;
+			c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1)) 
+ENGINE=INNODB;
 
 INSERT INTO t1 VALUES ('D','D', 'Darmstadt', 'City', 0, 0, 0);
 INSERT INTO t1 VALUES ('B','B', 'Berlin', 'Mitte', 0, 0, 0);
 INSERT INTO t1 VALUES ('C','C', 'Cottbus', 'West', 0, 0 ,0);
 INSERT INTO t1 VALUES ('H','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!
-# This shall fail due to index not qualify
 connection default;
-INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
-
-UNINSTALL PLUGIN daemon_memcached;
-
-connection mysqltest1;
-USE test;
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
-CREATE TABLE t1        (c1  VARCHAR(32),
-                        c11 VARCHAR(32),
-			c2  VARCHAR(1024),
-			c21 VARCHAR(1024),
-			c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1));
-
-INSERT INTO t1 VALUES ('D','D', 'Darmstadt', 'City', 0, 0, 0);
-INSERT INTO t1 VALUES ('B','B', 'Berlin', 'Mitte', 0, 0, 0);
-INSERT INTO t1 VALUES ('C','C', 'Cottbus', 'West', 0, 0 ,0);
-INSERT INTO t1 VALUES ('H','H', 'Hamburg', 'Norderstedt', 0, 0, 0);
 
-connection default;
 INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
 
 # The following select is writing all to  memcache otherwisw memcache is empty.
@@ -229,6 +193,7 @@ SELECT c1,c11,c2,c21 FROM t1;
 connection default;
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
+# We can never drop primary key
 ALTER TABLE test.t1 DROP PRIMARY KEY;
 INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
 
@@ -256,7 +221,7 @@ SELECT c1,c11,c2,c21 FROM t1;
 connection default;
 # Stop plugin befor innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
-ALTER TABLE test.t1 ADD CONSTRAINT PRIMARY KEY (c11);
+ALTER TABLE test.t1 ADD CONSTRAINT PRIMARY KEY (c1);
 INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
 
 SHOW CREATE TABLE test.t1;
@@ -285,10 +250,14 @@ EOF
 --sorted_result
 SELECT c1,c11,c2,c21 FROM t1;
 
+# Now switch to column "c11"
 connection default;
-# Stop plugin befor innodb_memcached configuration
+# Stop plugin before innodb_memcached configuration
 UNINSTALL PLUGIN daemon_memcached;
 ALTER TABLE test.t1 DROP COLUMN c1;
+# Need to add index on column c11 and also update the innodb_memcache.containers
+UPDATE innodb_memcache.containers set key_columns = "c11", unique_idx_name_on_key="idx";
+create unique index idx on test.t1(c11);
 INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
 
 connection mysqltest1;
@@ -316,7 +285,6 @@ EOF
 SELECT c11,c2,c21 FROM t1;
 
 DROP TABLE t1;
-DROP TABLE t2;
 connection default;
 disconnect mysqltest1;
 DROP DATABASE innodb_memcache;

=== modified file 'mysql-test/suite/memcached/t/memc273_5_tables.test'
--- a/mysql-test/suite/memcached/t/memc273_5_tables.test	2012-05-24 09:10:25 +0000
+++ b/mysql-test/suite/memcached/t/memc273_5_tables.test	2012-05-24 13:18:23 +0000
@@ -2,8 +2,6 @@ source include/not_valgrind.inc;
 source include/have_memcached_plugin.inc;
 source include/not_windows.inc;
 source include/have_innodb.inc;
-select * FROM INFORMATION_SCHEMA.PLUGINS
-  WHERE PLUGIN_NAME='daemon_memcached';
 
 --disable_query_log
 CALL mtr.add_suppression("daemon-memcached-w-batch-size': unsigned");

=== modified file 'mysql-test/suite/memcached/t/memc275_5_tables_index.test'
--- a/mysql-test/suite/memcached/t/memc275_5_tables_index.test	2012-05-24 09:10:25 +0000
+++ b/mysql-test/suite/memcached/t/memc275_5_tables_index.test	2012-05-24 13:18:23 +0000
@@ -31,9 +31,9 @@ INSERT INTO config_options VALUES("table
 INSERT INTO containers VALUES ("desct1", "test", "t1",
 			       "c1", "c2,c21", "c3", "c4", "c5", "PRIMARY");
 INSERT INTO containers VALUES ("desct2", "test", "t2",
-			       "c1", "c11,c2", "c3", "c4", "c5", "it2c11");
+			       "c11", "c1,c2", "c3", "c4", "c5", "it2c11");
 INSERT INTO containers VALUES ("desct3", "test", "t3",
-			       "c1", "c2,c21", "c3", "c4", "c5", "it3c21");
+			       "c21", "c2,c1", "c3", "c4", "c5", "it3c21");
 INSERT INTO containers VALUES ("desct4", "test", "t4",
 			       "c1", "c2,c21,c22", "c3", "c4", "c5", "PRIMARY");
 INSERT INTO containers VALUES ("desct5", "test", "t5",
@@ -233,7 +233,7 @@ $val = $memd->get("E");
 if ($val) { print "$val\n"; }
 print "Here the memcached results after set in t2:\n";
 $val = $memd->set("\@\@desct2.E","Es|Essen");
-$val = $memd->get("\@\@desct2.Es");
+$val = $memd->get("\@\@desct2.E");
 if ($val) { print "$val\n"; }
 print "Here the memcached results after set in t5:\n";
 $val = $memd->get("\@\@desct5");
@@ -243,7 +243,7 @@ if ($val) { print "$val\n"; }
 print "Here the memcached results after set in t3:\n";
 $val = $memd->set('@@desct3.E',"Essen|Ost");
 $memd->get('@@desct3');
-$val = $memd->get("Ost");
+$val = $memd->get("E");
 if ($val) { print "$val\n"; }
 print "Here the memcached results after set in t4:\n";
 $val = $memd->set('@@desct4.E',"Essen|Mitte|111111");

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