3840 horst.hunger@stripped 2012-03-06
wl#5824: Modified tests to have better results.
added:
mysql-test/suite/memcached/README
modified:
mysql-test/suite/memcached/r/memc212_2_cols.result
mysql-test/suite/memcached/r/memc213_2_intcols.result
mysql-test/suite/memcached/r/memc214_5_cols.result
mysql-test/suite/memcached/r/memc215_50_cols.result
mysql-test/suite/memcached/r/memc216_5_utf8.result
mysql-test/suite/memcached/r/memc217_add.result
mysql-test/suite/memcached/r/memc218_decr.result
mysql-test/suite/memcached/r/memc219_delete.result
mysql-test/suite/memcached/r/memc221_get.result
mysql-test/suite/memcached/r/memc222_incr.result
mysql-test/suite/memcached/r/memc223_index_1.result
mysql-test/suite/memcached/r/memc224_index_2.result
mysql-test/suite/memcached/r/memc225_index_3.result
mysql-test/suite/memcached/r/memc226_index_4.result
mysql-test/suite/memcached/r/memc227_lock.result
mysql-test/suite/memcached/r/memc228_mdl_1.result
mysql-test/suite/memcached/r/memc229_mdl_2.result
mysql-test/suite/memcached/r/memc230_mdl_3.result
mysql-test/suite/memcached/r/memc231_mdl_4.result
mysql-test/suite/memcached/r/memc232_NULL_cols.result
mysql-test/suite/memcached/r/memc233_option.result
mysql-test/suite/memcached/r/memc234_r_batch_1.result
mysql-test/suite/memcached/r/memc235_r_batch_2.result
mysql-test/suite/memcached/r/memc236_r_batch_3.result
mysql-test/suite/memcached/r/memc237_sep_1.result
mysql-test/suite/memcached/r/memc238_sep_2.result
mysql-test/suite/memcached/r/memc239_sep_3.result
mysql-test/suite/memcached/r/memc240_sep_4.result
mysql-test/suite/memcached/r/memc241_replace.result
mysql-test/suite/memcached/r/memc242_set.result
mysql-test/suite/memcached/r/memc243_view.result
mysql-test/suite/memcached/r/memc244_w_batch_1.result
mysql-test/suite/memcached/r/memc245_w_batch_2.result
mysql-test/suite/memcached/r/memc246_w_batch_3.result
mysql-test/suite/memcached/t/memc212_2_cols.test
mysql-test/suite/memcached/t/memc213_2_intcols.test
mysql-test/suite/memcached/t/memc214_5_cols.test
mysql-test/suite/memcached/t/memc215_50_cols.test
mysql-test/suite/memcached/t/memc216_5_utf8.test
mysql-test/suite/memcached/t/memc217_add.test
mysql-test/suite/memcached/t/memc218_decr.test
mysql-test/suite/memcached/t/memc219_delete.test
mysql-test/suite/memcached/t/memc220_fkey_1.test
mysql-test/suite/memcached/t/memc221_get.test
mysql-test/suite/memcached/t/memc222_incr.test
mysql-test/suite/memcached/t/memc223_index_1.test
mysql-test/suite/memcached/t/memc224_index_2.test
mysql-test/suite/memcached/t/memc225_index_3.test
mysql-test/suite/memcached/t/memc226_index_4.test
mysql-test/suite/memcached/t/memc227_lock.test
mysql-test/suite/memcached/t/memc228_mdl_1.test
mysql-test/suite/memcached/t/memc229_mdl_2.test
mysql-test/suite/memcached/t/memc230_mdl_3.test
mysql-test/suite/memcached/t/memc231_mdl_4.test
mysql-test/suite/memcached/t/memc232_NULL_cols.test
mysql-test/suite/memcached/t/memc233_option.test
mysql-test/suite/memcached/t/memc234_r_batch_1.test
mysql-test/suite/memcached/t/memc235_r_batch_2.test
mysql-test/suite/memcached/t/memc236_r_batch_3.test
mysql-test/suite/memcached/t/memc237_sep_1.test
mysql-test/suite/memcached/t/memc238_sep_2.test
mysql-test/suite/memcached/t/memc239_sep_3.test
mysql-test/suite/memcached/t/memc240_sep_4.test
mysql-test/suite/memcached/t/memc241_replace.test
mysql-test/suite/memcached/t/memc242_set.test
mysql-test/suite/memcached/t/memc243_view.test
mysql-test/suite/memcached/t/memc244_w_batch_1.test
mysql-test/suite/memcached/t/memc245_w_batch_2.test
mysql-test/suite/memcached/t/memc246_w_batch_3.test
3839 Jimmy Yang 2012-03-05
Fix memc220_fkey_1.test, we can drop the mapped table only when the plugin
is uninstalled (otherwise, it remains in the background drop queue and not
dropped). Also consolidates some error checking and rollback code.
modified:
mysql-test/suite/memcached/r/memc219_delete.result
mysql-test/suite/memcached/r/memc220_fkey_1.result
mysql-test/suite/memcached/t/memc220_fkey_1.test
plugin/innodb_memcached/innodb_memcache/include/innodb_api.h
plugin/innodb_memcached/innodb_memcache/src/innodb_api.c
plugin/innodb_memcached/innodb_memcache/src/innodb_engine.c
=== added file 'mysql-test/suite/memcached/README'
--- a/mysql-test/suite/memcached/README 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/memcached/README 2012-03-06 08:52:09 +0000
@@ -0,0 +1,6 @@
+Created 2012-Feb-29.
+Author: Horst Hunger
+Each test in memcached is connecting to the memcached daemon with an IP and a port.
+The default IP is "127.0.0.1" and the default port number is 11211. Others can be used by setting the daemon_option -p, e.g. -p11212. Each test is connectiing with an own port number to be able to run in parallel to other memcached tests. The names of the memcached tests have the form memcXXX_... where XXX are the last 3 digits of the port number. The first 2 digits are "11", means the test "memc212_..." is uses the port "11212".
+As the port number should be clear use a not yet assigned port number for the test you want to add.
+
=== modified file 'mysql-test/suite/memcached/r/memc212_2_cols.result'
--- a/mysql-test/suite/memcached/r/memc212_2_cols.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc212_2_cols.result 2012-03-06 08:52:09 +0000
@@ -1,6 +1,3 @@
-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;
@@ -10,6 +7,7 @@ INSERT INTO config_options VALUES("separ
INSERT INTO containers VALUES ("desc_t1", "test", "t1",
"c1", "c2,c21", "c3", "c4", "c5", "PRIMARY");
USE test;
+DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c21 VARCHAR(1024),
=== modified file 'mysql-test/suite/memcached/r/memc213_2_intcols.result'
--- a/mysql-test/suite/memcached/r/memc213_2_intcols.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc213_2_intcols.result 2012-03-06 08:52:09 +0000
@@ -7,6 +7,7 @@ INSERT INTO config_options VALUES("separ
INSERT INTO containers VALUES ("desc_t1", "test", "t1",
"c1", "c2,c21", "c3", "c4", "c5", "PRIMARY");
USE test;
+DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 VARCHAR(32),
c2 INT,
c21 VARCHAR(1024),
=== modified file 'mysql-test/suite/memcached/r/memc214_5_cols.result'
--- a/mysql-test/suite/memcached/r/memc214_5_cols.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc214_5_cols.result 2012-03-06 08:52:09 +0000
@@ -7,6 +7,7 @@ INSERT INTO config_options VALUES("separ
INSERT INTO containers VALUES ("desc_t1", "test", "t1",
"c1", "c2,c21,c22,c23,c24,c25", "c3", "c4", "c5", "PRIMARY");
USE test;
+DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(40),
c21 CHAR(40),
=== modified file 'mysql-test/suite/memcached/r/memc215_50_cols.result'
--- a/mysql-test/suite/memcached/r/memc215_50_cols.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc215_50_cols.result 2012-03-06 08:52:09 +0000
@@ -28,6 +28,7 @@ INSERT INTO containers VALUES ("desc_t1"
c220,c221,c222,c223,c224,c225,c226,c227,c228,c229",
"c3", "c4", "c5", "PRIMARY");
USE test;
+DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 VARCHAR(32),
c200 VARCHAR(40),
c201 VARCHAR(40),
=== modified file 'mysql-test/suite/memcached/r/memc216_5_utf8.result'
--- a/mysql-test/suite/memcached/r/memc216_5_utf8.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc216_5_utf8.result 2012-03-06 08:52:09 +0000
@@ -7,6 +7,7 @@ INSERT INTO config_options VALUES("separ
INSERT INTO containers VALUES ("desc_t1", "test", "t1",
"c1", "c2,c21,c22,c23,c24,c25", "c3", "c4", "c5", "PRIMARY");
USE test;
+DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(40),
c21 VARCHAR(40),
=== modified file 'mysql-test/suite/memcached/r/memc217_add.result'
--- a/mysql-test/suite/memcached/r/memc217_add.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc217_add.result 2012-03-06 08:52:09 +0000
@@ -7,6 +7,7 @@ INSERT INTO config_options VALUES("separ
INSERT INTO containers VALUES ("desc_t1", "test", "t1",
"c1", "c2", "c3", "c4", "c5", "PRIMARY");
USE test;
+DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
=== modified file 'mysql-test/suite/memcached/r/memc218_decr.result'
--- a/mysql-test/suite/memcached/r/memc218_decr.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc218_decr.result 2012-03-06 08:52:09 +0000
@@ -8,8 +8,6 @@ INSERT INTO containers VALUES ("desc_t1"
"c1", "c2", "c3", "c4", "c5", "PRIMARY");
USE test;
DROP TABLE IF EXISTS t1;
-Warnings:
-Note 1051 Unknown table 'test.t1'
CREATE TABLE t1 (c1 VARCHAR(255),
c2 VARCHAR(1024),
c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
=== modified file 'mysql-test/suite/memcached/r/memc219_delete.result'
--- a/mysql-test/suite/memcached/r/memc219_delete.result 2012-03-05 03:54:53 +0000
+++ b/mysql-test/suite/memcached/r/memc219_delete.result 2012-03-06 08:52:09 +0000
@@ -7,6 +7,7 @@ INSERT INTO config_options VALUES("separ
INSERT INTO containers VALUES ("desc_t1", "test", "t1",
"c1", "c2", "c3", "c4", "c5", "PRIMARY");
USE test;
+DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
=== modified file 'mysql-test/suite/memcached/r/memc221_get.result'
--- a/mysql-test/suite/memcached/r/memc221_get.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc221_get.result 2012-03-06 08:52:09 +0000
@@ -7,6 +7,7 @@ INSERT INTO config_options VALUES("separ
INSERT INTO containers VALUES ("desc_t1", "test", "t1",
"c1", "c2", "c3", "c4", "c5", "PRIMARY");
USE test;
+DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
=== modified file 'mysql-test/suite/memcached/r/memc222_incr.result'
--- a/mysql-test/suite/memcached/r/memc222_incr.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc222_incr.result 2012-03-06 08:52:09 +0000
@@ -8,8 +8,6 @@ INSERT INTO containers VALUES ("desc_t1"
"c1", "c2", "c3", "c4", "c5", "PRIMARY");
USE test;
DROP TABLE IF EXISTS t1;
-Warnings:
-Note 1051 Unknown table 'test.t1'
CREATE TABLE t1 (c1 VARCHAR(255),
c2 VARCHAR(1024),
c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
=== modified file 'mysql-test/suite/memcached/r/memc223_index_1.result'
--- a/mysql-test/suite/memcached/r/memc223_index_1.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc223_index_1.result 2012-03-06 08:52:09 +0000
@@ -7,13 +7,17 @@ INSERT INTO config_options VALUES("separ
INSERT INTO containers VALUES ("desc_t1", "test", "t1",
"c1,c11", "c2,c21", "c3", "c4", "c5", "PRIMARY");
CREATE USER mysqltest1@localhost;
+connect mysqltest1,localhost,mysqltest1,,;
+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,c11))
ENGINE = INNODB;
+DROP TABLE IF EXISTS t2;
CREATE TABLE t2 (c1 VARCHAR(32),
c2 VARCHAR(255),
c21 VARCHAR(255),
@@ -27,7 +31,9 @@ INSERT INTO t2 VALUES ('D', 'Darmstadt',
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';
+connection mysqltest1;
USE test;
SELECT c1,c11,c2,c21 FROM t1;
c1 c11 c2 c21
@@ -93,6 +99,8 @@ D D Darmstadt City
H H Hamburg Norderstedt
DROP TABLE t1;
DROP TABLE t2;
+connection default;
+disconnect mysqltest1;
DROP DATABASE innodb_memcache;
DROP USER mysqltest1@localhost;
SET @@global.tx_isolation= @tx_isolation;
=== modified file 'mysql-test/suite/memcached/r/memc224_index_2.result'
--- a/mysql-test/suite/memcached/r/memc224_index_2.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc224_index_2.result 2012-03-06 08:52:09 +0000
@@ -7,13 +7,17 @@ INSERT INTO config_options VALUES("separ
INSERT INTO containers VALUES ("desc_t1", "test", "t1",
"c11", "c2,c21", "c3", "c4", "c5", "PRIMARY");
CREATE USER mysqltest1@localhost;
+connect mysqltest1,localhost,mysqltest1,,;
+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,c11))
ENGINE = INNODB;
+DROP TABLE IF EXISTS t2;
CREATE TABLE t2 (c1 VARCHAR(32),
c2 VARCHAR(255),
c21 VARCHAR(255),
@@ -27,10 +31,12 @@ INSERT INTO t2 VALUES ('D', 'Darmstadt',
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 t1;
+DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 VARCHAR(32),
c11 VARCHAR(32),
c2 VARCHAR(1024),
@@ -40,7 +46,9 @@ INSERT INTO t1 VALUES ('D','D', 'Darmsta
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';
+connection mysqltest1;
USE test;
SELECT c1,c11,c2,c21 FROM t1;
c1 c11 c2 c21
@@ -97,9 +105,11 @@ B B Berlin Mitte
C C Cottbus West
D D Darmstadt City
H H Hamburg Norderstedt
+connection default;
UNINSTALL PLUGIN daemon_memcached;
ALTER TABLE test.t1 DROP PRIMARY KEY;
INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
+connection mysqltest1;
Here the memcached results after set:
SELECT c1,c11,c2,c21 FROM t1;
c1 c11 c2 c21
@@ -107,6 +117,7 @@ B B Berlin Mitte
C C Cottbus West
D D Darmstadt City
H H Hamburg Norderstedt
+connection default;
UNINSTALL PLUGIN daemon_memcached;
ALTER TABLE test.t1 ADD CONSTRAINT PRIMARY KEY (c11);
INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
@@ -122,6 +133,7 @@ t1 CREATE TABLE `t1` (
`c5` int(11) DEFAULT NULL,
PRIMARY KEY (`c11`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
+connection mysqltest1;
Here the memcached results after set:
SELECT c1,c11,c2,c21 FROM t1;
c1 c11 c2 c21
@@ -129,9 +141,11 @@ B B Berlin Mitte
C C Cottbus West
D D Darmstadt City
H H Hamburg Norderstedt
+connection default;
UNINSTALL PLUGIN daemon_memcached;
ALTER TABLE test.t1 DROP COLUMN c1;
INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
+connection mysqltest1;
Here the memcached results after add:
Essen|Ost
Frankfurt|Sachsenhause
@@ -146,6 +160,8 @@ F Frankfurt Sachsenhause
H Hamburg Norderstedt
DROP TABLE t1;
DROP TABLE t2;
+connection default;
+disconnect mysqltest1;
DROP DATABASE innodb_memcache;
DROP USER mysqltest1@localhost;
SET @@global.tx_isolation= @tx_isolation;
=== modified file 'mysql-test/suite/memcached/r/memc225_index_3.result'
--- a/mysql-test/suite/memcached/r/memc225_index_3.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc225_index_3.result 2012-03-06 08:52:09 +0000
@@ -7,13 +7,17 @@ INSERT INTO config_options VALUES("separ
INSERT INTO containers VALUES ("desc_t1", "test", "t1",
"c11", "c2,c21", "c3", "c4", "c5", "it1");
CREATE USER mysqltest1@localhost;
+connect mysqltest1,localhost,mysqltest1,,;
+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))
ENGINE = INNODB;
+DROP TABLE IF EXISTS t2;
CREATE TABLE t2 (c1 VARCHAR(32),
c2 VARCHAR(255),
c21 VARCHAR(255),
@@ -28,7 +32,9 @@ INSERT INTO t2 VALUES ('Bb', 'Berlin', '
INSERT INTO t2 VALUES ('Cc', 'Cottbus', 'West', 0, 0 ,0);
INSERT INTO t2 VALUES ('Hh', 'Hamburg', 'Norderstedt', 0, 0, 0);
CREATE UNIQUE INDEX it1 ON t1(c11);
+connection default;
INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
+connection mysqltest1;
USE test;
SELECT c1,c11,c2,c21 FROM t1;
c1 c11 c2 c21
@@ -85,9 +91,11 @@ B Bb Berlin Mitte
C Cc Cottbus West
D Dd Darmstadt City
H Hh Hamburg Norderstedt
+connection default;
UNINSTALL PLUGIN daemon_memcached;
ALTER TABLE test.t1 DROP PRIMARY KEY;
INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
+connection mysqltest1;
Here the memcached results after set:
SELECT c1,c11,c2,c21 FROM t1;
c1 c11 c2 c21
@@ -95,6 +103,7 @@ B Bb Berlin Mitte
C Cc Cottbus West
D Dd Darmstadt City
H Hh Hamburg Norderstedt
+connection default;
UNINSTALL PLUGIN daemon_memcached;
ALTER TABLE test.t1 ADD CONSTRAINT PRIMARY KEY (c11);
INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
@@ -111,6 +120,7 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`c11`),
UNIQUE KEY `it1` (`c11`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
+connection mysqltest1;
Here the memcached results after set:
SELECT c1,c11,c2,c21 FROM t1;
c1 c11 c2 c21
@@ -118,9 +128,11 @@ B Bb Berlin Mitte
C Cc Cottbus West
D Dd Darmstadt City
H Hh Hamburg Norderstedt
+connection default;
UNINSTALL PLUGIN daemon_memcached;
ALTER TABLE test.t1 DROP COLUMN c1;
INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
+connection mysqltest1;
Here the memcached results after add:
Essen|Ost
Frankfurt|Sachsenhause
@@ -135,6 +147,8 @@ Ff Frankfurt Sachsenhause
Hh Hamburg Norderstedt
DROP TABLE t1;
DROP TABLE t2;
+connection default;
+disconnect mysqltest1;
DROP DATABASE innodb_memcache;
DROP USER mysqltest1@localhost;
SET @@global.tx_isolation= @tx_isolation;
=== modified file 'mysql-test/suite/memcached/r/memc226_index_4.result'
--- a/mysql-test/suite/memcached/r/memc226_index_4.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc226_index_4.result 2012-03-06 08:52:09 +0000
@@ -7,7 +7,10 @@ INSERT INTO config_options VALUES("separ
INSERT INTO containers VALUES ("desc_t1", "test", "t1",
"c1", "c2,c21", "c3", "c4", "c5", "it1");
CREATE USER mysqltest1@localhost;
+connect mysqltest1,localhost,mysqltest1,,;
+connection mysqltest1;
USE test;
+DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 VARCHAR(32),
c11 VARCHAR(32),
c2 VARCHAR(1024),
@@ -15,6 +18,7 @@ c21 VARCHAR(1024),
c3 INT, c4 BIGINT UNSIGNED, c5 INT)
ENGINE = INNODB;
CREATE INDEX it1 ON t1 (c1);
+DROP TABLE IF EXISTS t2;
CREATE TABLE t2 (c1 VARCHAR(32),
c2 VARCHAR(255),
c21 VARCHAR(255),
@@ -28,7 +32,9 @@ INSERT INTO t2 VALUES ('D', 'Darmstadt',
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';
+connection mysqltest1;
USE test;
SELECT c1,c2,c21 FROM t1;
c1 c2 c21
@@ -50,10 +56,14 @@ B Berlin Mitte
C Cottbus West
D Darmstadt City
H Hamburg Norderstedt
+connection default;
UNINSTALL PLUGIN daemon_memcached;
+connection mysqltest1;
DROP INDEX it1 ON t1;
CREATE UNIQUE INDEX it1 ON t1 (c1);
+connection default;
INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
+connection mysqltest1;
Here the memcached results with D,B,H,C:
Darmstadt|City
Berlin|Mitte
@@ -124,6 +134,8 @@ F Frankfurt a. M. Sachsenhausen
H Hamburg Norderstedt
DROP TABLE t1;
DROP TABLE t2;
+connection default;
+disconnect mysqltest1;
DROP DATABASE innodb_memcache;
DROP USER mysqltest1@localhost;
SET @@global.tx_isolation= @tx_isolation;
=== modified file 'mysql-test/suite/memcached/r/memc227_lock.result'
--- a/mysql-test/suite/memcached/r/memc227_lock.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc227_lock.result 2012-03-06 08:52:09 +0000
@@ -8,12 +8,17 @@ INSERT INTO containers VALUES ("desc_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;
+DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c21 VARCHAR(1024),
c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
ENGINE = INNODB;
+DROP TABLE IF EXISTS t2;
CREATE TABLE t2 (c1 VARCHAR(32),
c2 VARCHAR(255),
c21 VARCHAR(255),
@@ -27,7 +32,9 @@ INSERT INTO t2 VALUES ('D', 'Darmstadt',
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';
+connection mysqltest2;
USE test;
SELECT c1,c2,c21 FROM t1;
c1 c2 c21
@@ -35,7 +42,9 @@ B Berlin Mitte
C Cottbus West
D Darmstadt City
H Hamburg Norderstedt
+connection mysqltest1;
LOCK TABLES t2 READ;
+connection mysqltest2;
Here the memcached results with D,B,H,C:
Darmstadt|City
Berlin|Mitte
@@ -47,7 +56,9 @@ B Berlin Mitte
C Cottbus West
D Darmstadt City
H Hamburg Norderstedt
+connection mysqltest1;
UNLOCK TABLES;
+connection mysqltest2;
Here the memcached results after set:
Essen|Ost
SELECT c1,c2,c21 FROM t1;
@@ -57,6 +68,7 @@ C Cottbus West
D Darmstadt City
E Essen Ost
H Hamburg Norderstedt
+connection mysqltest1;
LOCK TABLES t2 WRITE;
Here the memcached results after add:
Frankfurt|Sachsenhause
@@ -75,6 +87,7 @@ Here the memcached results after add |Ai
Frankfurt|
SELECT c1,c2,c21 FROM t1;
ERROR HY000: Table 't1' was not locked with LOCK TABLES
+connection mysqltest1;
UNLOCK TABLES;
Here the memcached results after replace Frankfurt a.M.:
Frankfurt a. M.|
@@ -88,8 +101,12 @@ D Darmstadt City
E Essen Ost
F NULL Sachsenhausen
H Hamburg Norderstedt
+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;
=== modified file 'mysql-test/suite/memcached/r/memc228_mdl_1.result'
--- a/mysql-test/suite/memcached/r/memc228_mdl_1.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc228_mdl_1.result 2012-03-06 08:52:09 +0000
@@ -8,12 +8,17 @@ INSERT INTO containers VALUES ("desc_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;
+DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c21 VARCHAR(1024),
c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
ENGINE = INNODB;
+DROP TABLE IF EXISTS t2;
CREATE TABLE t2 (c1 VARCHAR(32),
c2 VARCHAR(255),
c21 VARCHAR(255),
@@ -27,7 +32,9 @@ INSERT INTO t2 VALUES ('D', 'Darmstadt',
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';
+connection mysqltest2;
USE test;
SELECT c1,c2,c21 FROM t1;
c1 c2 c21
@@ -35,11 +42,14 @@ B Berlin Mitte
C Cottbus West
D Darmstadt City
H Hamburg Norderstedt
+connection mysqltest1;
send DROP TABLE IF EXISTS t1
DROP TABLE IF EXISTS t1;
Here the memcached results with D,B,H,C:
+connection mysqltest2;
SELECT c1,c2,c21 FROM t1;
ERROR 42S02: Table 'test.t1' doesn't exist
+connection mysqltest1;
Here the memcached results after set:
Here the memcached results after add:
Here the memcached results after replace:
@@ -48,10 +58,15 @@ Here the memcached results after add Fra
Here the memcached results after add |Airport:
Here the memcached results after replace Frankfurt a.M.:
Here the memcached results after replace Sachsenhausen:
+connection mysqltest2;
SELECT c1,c2,c21 FROM t1;
ERROR 42S02: Table 'test.t1' doesn't exist
+connection mysqltest1;
reap
DROP TABLE t2;
+connection default;
+disconnect mysqltest1;
+disconnect mysqltest2;
DROP DATABASE innodb_memcache;
DROP USER mysqltest1@localhost;
DROP USER mysqltest2@localhost;
=== modified file 'mysql-test/suite/memcached/r/memc229_mdl_2.result'
--- a/mysql-test/suite/memcached/r/memc229_mdl_2.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc229_mdl_2.result 2012-03-06 08:52:09 +0000
@@ -8,12 +8,17 @@ INSERT INTO containers VALUES ("desc_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;
+DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c21 VARCHAR(1024),
c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
ENGINE = INNODB;
+DROP TABLE IF EXISTS t2;
CREATE TABLE t2 (c1 VARCHAR(32),
c2 VARCHAR(255),
c21 VARCHAR(255),
@@ -27,7 +32,9 @@ INSERT INTO t2 VALUES ('D', 'Darmstadt',
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';
+connection mysqltest2;
USE test;
SELECT c1,c2,c21 FROM t1;
c1 c2 c21
@@ -35,6 +42,7 @@ B Berlin Mitte
C Cottbus West
D Darmstadt City
H Hamburg Norderstedt
+connection mysqltest1;
send ALTER TABLE t1 DROP c21
ALTER TABLE t1 DROP c21;
reap
@@ -61,6 +69,9 @@ SELECT c1,c2,c21 FROM t1;
ERROR 42S22: Unknown column 'c21' in 'field list'
DROP TABLE t1;
DROP TABLE t2;
+connection default;
+disconnect mysqltest1;
+disconnect mysqltest2;
DROP DATABASE innodb_memcache;
DROP USER mysqltest1@localhost;
DROP USER mysqltest2@localhost;
=== modified file 'mysql-test/suite/memcached/r/memc230_mdl_3.result'
--- a/mysql-test/suite/memcached/r/memc230_mdl_3.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc230_mdl_3.result 2012-03-06 08:52:09 +0000
@@ -8,12 +8,17 @@ INSERT INTO containers VALUES ("desc_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;
+DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c21 VARCHAR(1024),
c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
ENGINE = INNODB;
+DROP TABLE IF EXISTS t2;
CREATE TABLE t2 (c1 VARCHAR(32),
c2 VARCHAR(255),
c21 VARCHAR(255),
@@ -27,7 +32,9 @@ INSERT INTO t2 VALUES ('D', 'Darmstadt',
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';
+connection mysqltest2;
USE test;
SELECT c1,c2,c21 FROM t1;
c1 c2 c21
@@ -35,8 +42,10 @@ B Berlin Mitte
C Cottbus West
D Darmstadt City
H Hamburg Norderstedt
+connection mysqltest1;
send DROP TABLE IF EXISTS t1
DROP TABLE IF EXISTS t1;
+connection mysqltest2;
Here the memcached results with D,B,H,C:
SELECT c1,c2,c21 FROM t1;
ERROR 42S02: Table 'test.t1' doesn't exist
@@ -50,8 +59,12 @@ Here the memcached results after replace
Here the memcached results after replace Sachsenhausen:
SELECT c1,c2,c21 FROM t1;
ERROR 42S02: Table 'test.t1' doesn't exist
+connection mysqltest1;
reap
DROP TABLE t2;
+connection default;
+disconnect mysqltest1;
+disconnect mysqltest2;
DROP DATABASE innodb_memcache;
DROP USER mysqltest1@localhost;
DROP USER mysqltest2@localhost;
=== modified file 'mysql-test/suite/memcached/r/memc231_mdl_4.result'
--- a/mysql-test/suite/memcached/r/memc231_mdl_4.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc231_mdl_4.result 2012-03-06 08:52:09 +0000
@@ -7,12 +7,16 @@ INSERT INTO config_options VALUES("separ
INSERT INTO containers VALUES ("desc_v1", "test", "v1",
"vc1", "vc2,vc21", "vc3", "vc4", "vc5", "PRIMARY");
CREATE USER mysqltest1@localhost;
+connect mysqltest1,localhost,mysqltest1,,;
+connection mysqltest1;
USE test;
+DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c21 VARCHAR(1024),
c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
ENGINE = INNODB;
+DROP TABLE IF EXISTS t2;
CREATE TABLE t2 (c1 VARCHAR(32),
c2 VARCHAR(255),
c21 VARCHAR(255),
@@ -28,7 +32,9 @@ INSERT INTO t2 VALUES ('C', 'Cottbus', '
INSERT INTO t2 VALUES ('H', 'Hamburg', 'Norderstedt', 0, 0, 0);
CREATE VIEW v1 AS SELECT t1.c1 AS vc1,t1.c2 AS vc2,t2.c21 AS vc21,
t1.c3 AS vc3,t1.c4 AS vc4,t1.c5 AS vc5 FROM t1,t2 WHERE t1.c1=t2.c1;
+connection default;
INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
+connection mysqltest1;
USE test;
SELECT vc1,vc2,vc21 FROM v1;
vc1 vc2 vc21
@@ -48,6 +54,8 @@ Here the memcached results after replace
DROP VIEW v1;
DROP TABLE t1;
DROP TABLE t2;
+connection default;
+disconnect mysqltest1;
DROP DATABASE innodb_memcache;
DROP USER mysqltest1@localhost;
SET @@global.tx_isolation= @tx_isolation;
=== modified file 'mysql-test/suite/memcached/r/memc232_NULL_cols.result'
--- a/mysql-test/suite/memcached/r/memc232_NULL_cols.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc232_NULL_cols.result 2012-03-06 08:52:09 +0000
@@ -7,6 +7,7 @@ INSERT INTO config_options VALUES("separ
INSERT INTO containers VALUES ("desc_t1", "test", "t1",
"c1", "c2,c21,c22,c23,c24,c25", "c3", "c4", "c5", "PRIMARY");
USE test;
+DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(40),
c21 VARCHAR(40),
=== modified file 'mysql-test/suite/memcached/r/memc233_option.result'
--- a/mysql-test/suite/memcached/r/memc233_option.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc233_option.result 2012-03-06 08:52:09 +0000
@@ -10,6 +10,7 @@ INSERT INTO config_options VALUES("separ
INSERT INTO containers VALUES ("desc_t1", "test", "t1",
"c1", "c2,c21", "c3", "c4", "c5", "PRIMARY");
USE test;
+DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c21 VARCHAR(1024),
=== modified file 'mysql-test/suite/memcached/r/memc234_r_batch_1.result'
--- a/mysql-test/suite/memcached/r/memc234_r_batch_1.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc234_r_batch_1.result 2012-03-06 08:52:09 +0000
@@ -7,6 +7,7 @@ INSERT INTO config_options VALUES("separ
INSERT INTO containers VALUES ("desc_t1", "test", "t1",
"c1", "c2,c21", "c3", "c4", "c5", "PRIMARY");
USE test;
+DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c21 VARCHAR(1024),
=== modified file 'mysql-test/suite/memcached/r/memc235_r_batch_2.result'
--- a/mysql-test/suite/memcached/r/memc235_r_batch_2.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc235_r_batch_2.result 2012-03-06 08:52:09 +0000
@@ -7,6 +7,7 @@ INSERT INTO config_options VALUES("separ
INSERT INTO containers VALUES ("desc_t1", "test", "t1",
"c1", "c2,c21", "c3", "c4", "c5", "PRIMARY");
USE test;
+DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c21 VARCHAR(1024),
=== modified file 'mysql-test/suite/memcached/r/memc236_r_batch_3.result'
--- a/mysql-test/suite/memcached/r/memc236_r_batch_3.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc236_r_batch_3.result 2012-03-06 08:52:09 +0000
@@ -7,6 +7,7 @@ INSERT INTO config_options VALUES("separ
INSERT INTO containers VALUES ("desc_t1", "test", "t1",
"c1", "c2,c21", "c3", "c4", "c5", "PRIMARY");
USE test;
+DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c21 VARCHAR(1024),
=== modified file 'mysql-test/suite/memcached/r/memc237_sep_1.result'
--- a/mysql-test/suite/memcached/r/memc237_sep_1.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc237_sep_1.result 2012-03-06 08:52:09 +0000
@@ -7,6 +7,7 @@ INSERT INTO config_options VALUES("separ
INSERT INTO containers VALUES ("desc_t1", "test", "t1",
"c1", "c2,c21,c22,c23,c24,c25", "c3", "c4", "c5", "PRIMARY");
USE test;
+DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(40),
c21 VARCHAR(40),
=== modified file 'mysql-test/suite/memcached/r/memc238_sep_2.result'
--- a/mysql-test/suite/memcached/r/memc238_sep_2.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc238_sep_2.result 2012-03-06 08:52:09 +0000
@@ -7,6 +7,7 @@ INSERT INTO config_options VALUES("separ
INSERT INTO containers VALUES ("desc_t1", "test", "t1",
"c1", "c2,c21,c22,c23,c24,c25", "c3", "c4", "c5", "PRIMARY");
USE test;
+DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(40),
c21 VARCHAR(40),
=== modified file 'mysql-test/suite/memcached/r/memc239_sep_3.result'
--- a/mysql-test/suite/memcached/r/memc239_sep_3.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc239_sep_3.result 2012-03-06 08:52:09 +0000
@@ -7,6 +7,7 @@ INSERT INTO config_options VALUES("separ
INSERT INTO containers VALUES ("desc_t1", "test", "t1",
"c1", "c2,c21,c22,c23,c24,c25", "c3", "c4", "c5", "PRIMARY");
USE test;
+DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(40),
c21 VARCHAR(40),
=== modified file 'mysql-test/suite/memcached/r/memc240_sep_4.result'
--- a/mysql-test/suite/memcached/r/memc240_sep_4.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc240_sep_4.result 2012-03-06 08:52:09 +0000
@@ -7,6 +7,7 @@ INSERT INTO config_options VALUES("separ
INSERT INTO containers VALUES ("desc_t1", "test", "t1",
"c1", "c2,c21,c22,c23,c24,c25", "c3", "c4", "c5", "PRIMARY");
USE test;
+DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(40),
c21 VARCHAR(40),
=== modified file 'mysql-test/suite/memcached/r/memc241_replace.result'
--- a/mysql-test/suite/memcached/r/memc241_replace.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc241_replace.result 2012-03-06 08:52:09 +0000
@@ -7,6 +7,7 @@ INSERT INTO config_options VALUES("separ
INSERT INTO containers VALUES ("desc_t1", "test", "t1",
"c1", "c2", "c3", "c4", "c5", "PRIMARY");
USE test;
+DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
=== modified file 'mysql-test/suite/memcached/r/memc242_set.result'
--- a/mysql-test/suite/memcached/r/memc242_set.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc242_set.result 2012-03-06 08:52:09 +0000
@@ -7,6 +7,7 @@ INSERT INTO config_options VALUES("separ
INSERT INTO containers VALUES ("desc_t1", "test", "t1",
"c1", "c2", "c3", "c4", "c5", "PRIMARY");
USE test;
+DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
=== modified file 'mysql-test/suite/memcached/r/memc243_view.result'
--- a/mysql-test/suite/memcached/r/memc243_view.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc243_view.result 2012-03-06 08:52:09 +0000
@@ -7,12 +7,16 @@ INSERT INTO config_options VALUES("separ
INSERT INTO containers VALUES ("desc_v1", "test", "v1",
"vc1", "vc2,vc21", "vc3", "vc4", "vc5", "PRIMARY");
CREATE USER mysqltest1@localhost;
+connect mysqltest1,localhost,mysqltest1,,;
+connection mysqltest1;
USE test;
+DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c21 VARCHAR(1024),
c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
ENGINE = INNODB;
+DROP TABLE IF EXISTS t2;
CREATE TABLE t2 (c1 VARCHAR(32),
c2 VARCHAR(255),
c21 VARCHAR(255),
@@ -28,7 +32,9 @@ INSERT INTO t2 VALUES ('C', 'Cottbus', '
INSERT INTO t2 VALUES ('H', 'Hamburg', 'Norderstedt', 0, 0, 0);
CREATE VIEW v1 AS SELECT t1.c1 AS vc1,t1.c2 AS vc2,t2.c21 AS vc21,
t1.c3 AS vc3,t1.c4 AS vc4,t1.c5 AS vc5 FROM t1,t2 WHERE t1.c1=t2.c1;
+connection default;
INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
+connection mysqltest1;
USE test;
SELECT vc1,vc2,vc21 FROM v1;
vc1 vc2 vc21
@@ -48,6 +54,8 @@ Here the memcached results after replace
DROP VIEW v1;
DROP TABLE t1;
DROP TABLE t2;
+connection default;
+disconnect mysqltest1;
DROP DATABASE innodb_memcache;
DROP USER mysqltest1@localhost;
SET @@global.tx_isolation= @tx_isolation;
=== modified file 'mysql-test/suite/memcached/r/memc244_w_batch_1.result'
--- a/mysql-test/suite/memcached/r/memc244_w_batch_1.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc244_w_batch_1.result 2012-03-06 08:52:09 +0000
@@ -7,6 +7,7 @@ INSERT INTO config_options VALUES("separ
INSERT INTO containers VALUES ("desc_t1", "test", "t1",
"c1", "c2,c21", "c3", "c4", "c5", "PRIMARY");
USE test;
+DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c21 VARCHAR(1024),
=== modified file 'mysql-test/suite/memcached/r/memc245_w_batch_2.result'
--- a/mysql-test/suite/memcached/r/memc245_w_batch_2.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc245_w_batch_2.result 2012-03-06 08:52:09 +0000
@@ -7,6 +7,7 @@ INSERT INTO config_options VALUES("separ
INSERT INTO containers VALUES ("desc_t1", "test", "t1",
"c1", "c2,c21", "c3", "c4", "c5", "PRIMARY");
USE test;
+DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c21 VARCHAR(1024),
=== modified file 'mysql-test/suite/memcached/r/memc246_w_batch_3.result'
--- a/mysql-test/suite/memcached/r/memc246_w_batch_3.result 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/r/memc246_w_batch_3.result 2012-03-06 08:52:09 +0000
@@ -7,6 +7,7 @@ INSERT INTO config_options VALUES("separ
INSERT INTO containers VALUES ("desc_t1", "test", "t1",
"c1", "c2,c21", "c3", "c4", "c5", "PRIMARY");
USE test;
+DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c21 VARCHAR(1024),
=== modified file 'mysql-test/suite/memcached/t/memc212_2_cols.test'
--- a/mysql-test/suite/memcached/t/memc212_2_cols.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc212_2_cols.test 2012-03-06 08:52:09 +0000
@@ -1,10 +1,14 @@
+--disable_query_log
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");
+--enable_query_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+--enable_connect_log
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -26,6 +30,9 @@ INSERT INTO containers VALUES ("desc_t1"
USE test;
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c21 VARCHAR(1024),
=== modified file 'mysql-test/suite/memcached/t/memc213_2_intcols.test'
--- a/mysql-test/suite/memcached/t/memc213_2_intcols.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc213_2_intcols.test 2012-03-06 08:52:09 +0000
@@ -4,9 +4,11 @@ CALL mtr.add_suppression("Could not obta
CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
--enable_query_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -28,6 +30,9 @@ INSERT INTO containers VALUES ("desc_t1"
USE test;
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
CREATE TABLE t1 (c1 VARCHAR(32),
c2 INT,
c21 VARCHAR(1024),
=== modified file 'mysql-test/suite/memcached/t/memc214_5_cols.test'
--- a/mysql-test/suite/memcached/t/memc214_5_cols.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc214_5_cols.test 2012-03-06 08:52:09 +0000
@@ -7,6 +7,8 @@ CALL mtr.add_suppression("InnoDB: Warnin
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+--enable_connect_log
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -28,6 +30,9 @@ INSERT INTO containers VALUES ("desc_t1"
USE test;
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(40),
c21 CHAR(40),
=== modified file 'mysql-test/suite/memcached/t/memc215_50_cols.test'
--- a/mysql-test/suite/memcached/t/memc215_50_cols.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc215_50_cols.test 2012-03-06 08:52:09 +0000
@@ -4,9 +4,11 @@ CALL mtr.add_suppression("Could not obta
CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
--enable_query_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -49,6 +51,9 @@ INSERT INTO containers VALUES ("desc_t1"
USE test;
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
CREATE TABLE t1 (c1 VARCHAR(32),
c200 VARCHAR(40),
c201 VARCHAR(40),
=== modified file 'mysql-test/suite/memcached/t/memc216_5_utf8.test'
--- a/mysql-test/suite/memcached/t/memc216_5_utf8.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc216_5_utf8.test 2012-03-06 08:52:09 +0000
@@ -4,9 +4,11 @@ CALL mtr.add_suppression("Could not obta
CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
--enable_query_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -28,6 +30,9 @@ INSERT INTO containers VALUES ("desc_t1"
USE test;
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(40),
c21 VARCHAR(40),
=== modified file 'mysql-test/suite/memcached/t/memc217_add.test'
--- a/mysql-test/suite/memcached/t/memc217_add.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc217_add.test 2012-03-06 08:52:09 +0000
@@ -4,9 +4,11 @@ CALL mtr.add_suppression("Could not obta
CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
--enable_query_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -28,6 +30,9 @@ INSERT INTO containers VALUES ("desc_t1"
USE test;
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
=== modified file 'mysql-test/suite/memcached/t/memc218_decr.test'
--- a/mysql-test/suite/memcached/t/memc218_decr.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc218_decr.test 2012-03-06 08:52:09 +0000
@@ -4,9 +4,11 @@ CALL mtr.add_suppression("Could not obta
CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
--enable_query_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -28,8 +30,9 @@ INSERT INTO containers VALUES ("desc_t1"
USE test;
+--disable_warnings
DROP TABLE IF EXISTS t1;
-
+--enable_warnings
CREATE TABLE t1 (c1 VARCHAR(255),
c2 VARCHAR(1024),
c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
=== modified file 'mysql-test/suite/memcached/t/memc219_delete.test'
--- a/mysql-test/suite/memcached/t/memc219_delete.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc219_delete.test 2012-03-06 08:52:09 +0000
@@ -4,9 +4,11 @@ CALL mtr.add_suppression("Could not obta
CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
--enable_query_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -28,6 +30,9 @@ INSERT INTO containers VALUES ("desc_t1"
USE test;
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
=== modified file 'mysql-test/suite/memcached/t/memc220_fkey_1.test'
--- a/mysql-test/suite/memcached/t/memc220_fkey_1.test 2012-03-05 03:54:53 +0000
+++ b/mysql-test/suite/memcached/t/memc220_fkey_1.test 2012-03-06 08:52:09 +0000
@@ -5,9 +5,11 @@ CALL mtr.add_suppression("InnoDB: Warnin
CALL mtr.add_suppression("InnoDB: Error: MySQL is freeing a thd");
--enable_query_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
=== modified file 'mysql-test/suite/memcached/t/memc221_get.test'
--- a/mysql-test/suite/memcached/t/memc221_get.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc221_get.test 2012-03-06 08:52:09 +0000
@@ -4,9 +4,11 @@ CALL mtr.add_suppression("Could not obta
CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
--enable_query_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -28,6 +30,9 @@ INSERT INTO containers VALUES ("desc_t1"
USE test;
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
=== modified file 'mysql-test/suite/memcached/t/memc222_incr.test'
--- a/mysql-test/suite/memcached/t/memc222_incr.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc222_incr.test 2012-03-06 08:52:09 +0000
@@ -4,9 +4,11 @@ CALL mtr.add_suppression("Could not obta
CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
--enable_query_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -28,8 +30,9 @@ INSERT INTO containers VALUES ("desc_t1"
USE test;
+--disable_warnings
DROP TABLE IF EXISTS t1;
-
+--enable_warnings
CREATE TABLE t1 (c1 VARCHAR(255),
c2 VARCHAR(1024),
c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
=== modified file 'mysql-test/suite/memcached/t/memc223_index_1.test'
--- a/mysql-test/suite/memcached/t/memc223_index_1.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc223_index_1.test 2012-03-06 08:52:09 +0000
@@ -4,9 +4,11 @@ CALL mtr.add_suppression("Could not obta
CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
--enable_query_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -30,6 +32,9 @@ connect (mysqltest1,localhost,mysqltest1
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),
@@ -37,6 +42,9 @@ CREATE TABLE t1 (c1 VARCHAR(32),
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),
=== modified file 'mysql-test/suite/memcached/t/memc224_index_2.test'
--- a/mysql-test/suite/memcached/t/memc224_index_2.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc224_index_2.test 2012-03-06 08:52:09 +0000
@@ -4,9 +4,11 @@ CALL mtr.add_suppression("Could not obta
CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
--enable_query_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -30,6 +32,9 @@ connect (mysqltest1,localhost,mysqltest1
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),
@@ -37,6 +42,9 @@ CREATE TABLE t1 (c1 VARCHAR(32),
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),
@@ -62,8 +70,9 @@ UNINSTALL PLUGIN daemon_memcached;
connection mysqltest1;
USE test;
-DROP TABLE t1;
-
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
CREATE TABLE t1 (c1 VARCHAR(32),
c11 VARCHAR(32),
c2 VARCHAR(1024),
=== modified file 'mysql-test/suite/memcached/t/memc225_index_3.test'
--- a/mysql-test/suite/memcached/t/memc225_index_3.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc225_index_3.test 2012-03-06 08:52:09 +0000
@@ -4,9 +4,11 @@ CALL mtr.add_suppression("Could not obta
CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
--enable_query_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -30,6 +32,9 @@ connect (mysqltest1,localhost,mysqltest1
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),
@@ -37,6 +42,9 @@ CREATE TABLE t1 (c1 VARCHAR(32),
c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
ENGINE = INNODB;
+--disable_warnings
+DROP TABLE IF EXISTS t2;
+--enable_warnings
CREATE TABLE t2 (c1 VARCHAR(32),
c2 VARCHAR(255),
c21 VARCHAR(255),
=== modified file 'mysql-test/suite/memcached/t/memc226_index_4.test'
--- a/mysql-test/suite/memcached/t/memc226_index_4.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc226_index_4.test 2012-03-06 08:52:09 +0000
@@ -4,9 +4,11 @@ CALL mtr.add_suppression("Could not obta
CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
--enable_query_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -30,6 +32,9 @@ connect (mysqltest1,localhost,mysqltest1
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),
@@ -39,6 +44,9 @@ ENGINE = INNODB;
CREATE INDEX it1 ON t1 (c1);
+--disable_warnings
+DROP TABLE IF EXISTS t2;
+--enable_warnings
CREATE TABLE t2 (c1 VARCHAR(32),
c2 VARCHAR(255),
c21 VARCHAR(255),
=== modified file 'mysql-test/suite/memcached/t/memc227_lock.test'
--- a/mysql-test/suite/memcached/t/memc227_lock.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc227_lock.test 2012-03-06 08:52:09 +0000
@@ -3,10 +3,13 @@ CALL mtr.add_suppression("daemon-memcach
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");
--enable_query_log
+--enable_connect_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -33,12 +36,18 @@ connect (mysqltest2,localhost,mysqltest2
connection mysqltest1;
USE test;
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c21 VARCHAR(1024),
c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
ENGINE = INNODB;
+--disable_warnings
+DROP TABLE IF EXISTS t2;
+--enable_warnings
CREATE TABLE t2 (c1 VARCHAR(32),
c2 VARCHAR(255),
c21 VARCHAR(255),
=== modified file 'mysql-test/suite/memcached/t/memc228_mdl_1.test'
--- a/mysql-test/suite/memcached/t/memc228_mdl_1.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc228_mdl_1.test 2012-03-06 08:52:09 +0000
@@ -4,9 +4,11 @@ CALL mtr.add_suppression("Could not obta
CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
--enable_query_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -33,12 +35,18 @@ connect (mysqltest2,localhost,mysqltest2
connection mysqltest1;
USE test;
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c21 VARCHAR(1024),
c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
ENGINE = INNODB;
+--disable_warnings
+DROP TABLE IF EXISTS t2;
+--enable_warnings
CREATE TABLE t2 (c1 VARCHAR(32),
c2 VARCHAR(255),
c21 VARCHAR(255),
=== modified file 'mysql-test/suite/memcached/t/memc229_mdl_2.test'
--- a/mysql-test/suite/memcached/t/memc229_mdl_2.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc229_mdl_2.test 2012-03-06 08:52:09 +0000
@@ -4,9 +4,11 @@ CALL mtr.add_suppression("Could not obta
CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
--enable_query_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -33,12 +35,18 @@ connect (mysqltest2,localhost,mysqltest2
connection mysqltest1;
USE test;
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c21 VARCHAR(1024),
c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
ENGINE = INNODB;
+--disable_warnings
+DROP TABLE IF EXISTS t2;
+--enable_warnings
CREATE TABLE t2 (c1 VARCHAR(32),
c2 VARCHAR(255),
c21 VARCHAR(255),
=== modified file 'mysql-test/suite/memcached/t/memc230_mdl_3.test'
--- a/mysql-test/suite/memcached/t/memc230_mdl_3.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc230_mdl_3.test 2012-03-06 08:52:09 +0000
@@ -4,9 +4,11 @@ CALL mtr.add_suppression("Could not obta
CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
--enable_query_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -33,12 +35,18 @@ connect (mysqltest2,localhost,mysqltest2
connection mysqltest1;
USE test;
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c21 VARCHAR(1024),
c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
ENGINE = INNODB;
+--disable_warnings
+DROP TABLE IF EXISTS t2;
+--enable_warnings
CREATE TABLE t2 (c1 VARCHAR(32),
c2 VARCHAR(255),
c21 VARCHAR(255),
=== modified file 'mysql-test/suite/memcached/t/memc231_mdl_4.test'
--- a/mysql-test/suite/memcached/t/memc231_mdl_4.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc231_mdl_4.test 2012-03-06 08:52:09 +0000
@@ -4,9 +4,11 @@ CALL mtr.add_suppression("Could not obta
CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
--enable_query_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -30,12 +32,18 @@ connect (mysqltest1,localhost,mysqltest1
connection mysqltest1;
USE test;
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c21 VARCHAR(1024),
c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
ENGINE = INNODB;
+--disable_warnings
+DROP TABLE IF EXISTS t2;
+--enable_warnings
CREATE TABLE t2 (c1 VARCHAR(32),
c2 VARCHAR(255),
c21 VARCHAR(255),
=== modified file 'mysql-test/suite/memcached/t/memc232_NULL_cols.test'
--- a/mysql-test/suite/memcached/t/memc232_NULL_cols.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc232_NULL_cols.test 2012-03-06 08:52:09 +0000
@@ -4,9 +4,11 @@ CALL mtr.add_suppression("Could not obta
CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
--enable_query_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -28,6 +30,9 @@ INSERT INTO containers VALUES ("desc_t1"
USE test;
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(40),
c21 VARCHAR(40),
=== modified file 'mysql-test/suite/memcached/t/memc233_option.test'
--- a/mysql-test/suite/memcached/t/memc233_option.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc233_option.test 2012-03-06 08:52:09 +0000
@@ -4,10 +4,13 @@ CALL mtr.add_suppression("Could not obta
CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
--enable_query_log
+--enable_connect_log
+
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
SHOW VARIABLES LIKE 'daemon_memcached_option';
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -29,6 +32,9 @@ INSERT INTO containers VALUES ("desc_t1"
USE test;
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c21 VARCHAR(1024),
=== modified file 'mysql-test/suite/memcached/t/memc234_r_batch_1.test'
--- a/mysql-test/suite/memcached/t/memc234_r_batch_1.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc234_r_batch_1.test 2012-03-06 08:52:09 +0000
@@ -4,9 +4,11 @@ CALL mtr.add_suppression("Could not obta
CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
--enable_query_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -28,6 +30,9 @@ INSERT INTO containers VALUES ("desc_t1"
USE test;
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c21 VARCHAR(1024),
=== modified file 'mysql-test/suite/memcached/t/memc235_r_batch_2.test'
--- a/mysql-test/suite/memcached/t/memc235_r_batch_2.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc235_r_batch_2.test 2012-03-06 08:52:09 +0000
@@ -4,9 +4,11 @@ CALL mtr.add_suppression("Could not obta
CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
--enable_query_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -28,6 +30,9 @@ INSERT INTO containers VALUES ("desc_t1"
USE test;
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c21 VARCHAR(1024),
=== modified file 'mysql-test/suite/memcached/t/memc236_r_batch_3.test'
--- a/mysql-test/suite/memcached/t/memc236_r_batch_3.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc236_r_batch_3.test 2012-03-06 08:52:09 +0000
@@ -4,9 +4,11 @@ CALL mtr.add_suppression("Could not obta
CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
--enable_query_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -28,6 +30,9 @@ INSERT INTO containers VALUES ("desc_t1"
USE test;
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c21 VARCHAR(1024),
=== modified file 'mysql-test/suite/memcached/t/memc237_sep_1.test'
--- a/mysql-test/suite/memcached/t/memc237_sep_1.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc237_sep_1.test 2012-03-06 08:52:09 +0000
@@ -4,9 +4,11 @@ CALL mtr.add_suppression("Could not obta
CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
--enable_query_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -28,6 +30,9 @@ INSERT INTO containers VALUES ("desc_t1"
USE test;
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(40),
c21 VARCHAR(40),
=== modified file 'mysql-test/suite/memcached/t/memc238_sep_2.test'
--- a/mysql-test/suite/memcached/t/memc238_sep_2.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc238_sep_2.test 2012-03-06 08:52:09 +0000
@@ -4,9 +4,11 @@ CALL mtr.add_suppression("Could not obta
CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
--enable_query_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -28,6 +30,9 @@ INSERT INTO containers VALUES ("desc_t1"
USE test;
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(40),
c21 VARCHAR(40),
=== modified file 'mysql-test/suite/memcached/t/memc239_sep_3.test'
--- a/mysql-test/suite/memcached/t/memc239_sep_3.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc239_sep_3.test 2012-03-06 08:52:09 +0000
@@ -4,9 +4,11 @@ CALL mtr.add_suppression("Could not obta
CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
--enable_query_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -30,6 +32,9 @@ INSERT INTO containers VALUES ("desc_t1"
USE test;
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(40),
c21 VARCHAR(40),
=== modified file 'mysql-test/suite/memcached/t/memc240_sep_4.test'
--- a/mysql-test/suite/memcached/t/memc240_sep_4.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc240_sep_4.test 2012-03-06 08:52:09 +0000
@@ -4,9 +4,11 @@ CALL mtr.add_suppression("Could not obta
CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
--enable_query_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -28,6 +30,9 @@ INSERT INTO containers VALUES ("desc_t1"
USE test;
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(40),
c21 VARCHAR(40),
=== modified file 'mysql-test/suite/memcached/t/memc241_replace.test'
--- a/mysql-test/suite/memcached/t/memc241_replace.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc241_replace.test 2012-03-06 08:52:09 +0000
@@ -4,9 +4,11 @@ CALL mtr.add_suppression("Could not obta
CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
--enable_query_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -28,6 +30,9 @@ INSERT INTO containers VALUES ("desc_t1"
USE test;
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
=== modified file 'mysql-test/suite/memcached/t/memc242_set.test'
--- a/mysql-test/suite/memcached/t/memc242_set.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc242_set.test 2012-03-06 08:52:09 +0000
@@ -4,9 +4,11 @@ CALL mtr.add_suppression("Could not obta
CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
--enable_query_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -27,6 +29,9 @@ INSERT INTO containers VALUES ("desc_t1"
USE test;
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
=== modified file 'mysql-test/suite/memcached/t/memc243_view.test'
--- a/mysql-test/suite/memcached/t/memc243_view.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc243_view.test 2012-03-06 08:52:09 +0000
@@ -4,9 +4,11 @@ CALL mtr.add_suppression("Could not obta
CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
--enable_query_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -30,12 +32,18 @@ connect (mysqltest1,localhost,mysqltest1
connection mysqltest1;
USE test;
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c21 VARCHAR(1024),
c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
ENGINE = INNODB;
+--disable_warnings
+DROP TABLE IF EXISTS t2;
+--enable_warnings
CREATE TABLE t2 (c1 VARCHAR(32),
c2 VARCHAR(255),
c21 VARCHAR(255),
=== modified file 'mysql-test/suite/memcached/t/memc244_w_batch_1.test'
--- a/mysql-test/suite/memcached/t/memc244_w_batch_1.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc244_w_batch_1.test 2012-03-06 08:52:09 +0000
@@ -4,9 +4,11 @@ CALL mtr.add_suppression("Could not obta
CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
--enable_query_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -28,6 +30,9 @@ INSERT INTO containers VALUES ("desc_t1"
USE test;
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c21 VARCHAR(1024),
=== modified file 'mysql-test/suite/memcached/t/memc245_w_batch_2.test'
--- a/mysql-test/suite/memcached/t/memc245_w_batch_2.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc245_w_batch_2.test 2012-03-06 08:52:09 +0000
@@ -4,9 +4,11 @@ CALL mtr.add_suppression("Could not obta
CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
--enable_query_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -28,6 +30,9 @@ INSERT INTO containers VALUES ("desc_t1"
USE test;
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c21 VARCHAR(1024),
=== modified file 'mysql-test/suite/memcached/t/memc246_w_batch_3.test'
--- a/mysql-test/suite/memcached/t/memc246_w_batch_3.test 2012-03-02 12:18:15 +0000
+++ b/mysql-test/suite/memcached/t/memc246_w_batch_3.test 2012-03-06 08:52:09 +0000
@@ -4,9 +4,11 @@ CALL mtr.add_suppression("Could not obta
CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
--enable_query_log
+--enable_connect_log
SET @tx_isolation= @@global.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+source include/not_windows.inc;
source include/have_innodb.inc;
# Stop plugin befor innodb_memcached configuration
@@ -28,6 +30,9 @@ INSERT INTO containers VALUES ("desc_t1"
USE test;
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
CREATE TABLE t1 (c1 VARCHAR(32),
c2 VARCHAR(1024),
c21 VARCHAR(1024),
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk-wl5824 branch (horst.hunger:3839 to 3840) WL#5824 | horst.hunger | 6 Mar |
