List:Commits« Previous MessageNext Message »
From:horst.hunger Date:March 15 2012 8:57am
Subject:bzr push into mysql-trunk-wl5824 branch (horst.hunger:3859 to 3860)
View as plain text  
 3860 horst.hunger@stripped	2012-03-15
      wl5824: Some beautifications and fixed rpl test.

    modified:
      mysql-test/suite/memcached/README
      mysql-test/suite/memcached/r/rpl_memc271_2.result
      mysql-test/suite/memcached/t/rpl_memc270_1.test
      mysql-test/suite/memcached/t/rpl_memc271_2-master.opt
      mysql-test/suite/memcached/t/rpl_memc271_2-slave.opt
      mysql-test/suite/memcached/t/rpl_memc271_2.test
 3859 Jimmy Yang	2012-03-14
      Fix an issue with multi-value replication. Also doing some adjustment on
      replication tests.

    modified:
      mysql-test/suite/memcached/r/rpl_memc270_1.result
      mysql-test/suite/memcached/r/rpl_memc271_2.result
      mysql-test/suite/memcached/t/rpl_memc270_1-master.opt
      mysql-test/suite/memcached/t/rpl_memc270_1-slave.opt
      mysql-test/suite/memcached/t/rpl_memc270_1.test
      mysql-test/suite/memcached/t/rpl_memc271_2-master.opt
      mysql-test/suite/memcached/t/rpl_memc271_2-slave.opt
      mysql-test/suite/memcached/t/rpl_memc271_2.test
      plugin/innodb_memcached/innodb_memcache/src/innodb_api.c
=== modified file 'mysql-test/suite/memcached/README'
--- a/mysql-test/suite/memcached/README	2012-03-06 08:52:09 +0000
+++ b/mysql-test/suite/memcached/README	2012-03-15 08:56:40 +0000
@@ -1,5 +1,8 @@
 Created 2012-Feb-29.
 Author: Horst Hunger
+To run the memcached test you have to download and install the Memcached.pm module in Perl.
+It has to be installed in the Cache directory. 
+
 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/rpl_memc271_2.result'
--- a/mysql-test/suite/memcached/r/rpl_memc271_2.result	2012-03-14 11:54:01 +0000
+++ b/mysql-test/suite/memcached/r/rpl_memc271_2.result	2012-03-15 08:56:40 +0000
@@ -1,5 +1,3 @@
-include/master-slave.inc
-[connection master]
 SET @tx_isolation= @@global.tx_isolation;
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 UNINSTALL PLUGIN daemon_memcached;
@@ -8,6 +6,19 @@ INSERT INTO cache_policies VALUES("cache
 INSERT INTO config_options VALUES("separator", "|");
 INSERT INTO containers VALUES ("desc_t1", "test", "t1",
 "c1", "c2,c21", "c3", "c4", "c5", "PRIMARY");
+include/master-slave.inc
+connect  $rpl_connection_name,127.0.0.1,root,,test,$_rpl_port,;
+connection server_1;
+connect  $rpl_connection_name,127.0.0.1,root,,test,$_rpl_port,;
+connection server_1;
+connect  $rpl_connection_name,127.0.0.1,root,,test,$_rpl_port,;
+connection server_1;
+connect  $rpl_connection_name,127.0.0.1,root,,test,$_rpl_port,;
+connection server_1;
+connection server_1;
+connection default;
+[connection master]
+connection master;
 USE test;
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1        (c1 VARCHAR(32),
@@ -40,6 +51,17 @@ H	Hamburg	Norderstedt
 sync_slave_with_master;
 connection slave;
 connection slave;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` varchar(32) NOT NULL DEFAULT '',
+  `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 (`c1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SELECT c1,c2,c21 FROM t1;
 c1	c2	c21
 B	Berlin	Mitte
@@ -180,7 +202,6 @@ H	Hamburg	Norderstedt
 connection master;
 DROP TABLE t1;
 DROP DATABASE innodb_memcache;
-SET @@global.tx_isolation= @tx_isolation;
 connection slave;
 include/rpl_end.inc
 connection server_2;
@@ -204,3 +225,5 @@ disconnect server_2;
 disconnect server_2_1;
 disconnect server_1;
 disconnect server_1_1;
+connection default;
+SET @@global.tx_isolation= @tx_isolation;

=== modified file 'mysql-test/suite/memcached/t/rpl_memc270_1.test'
--- a/mysql-test/suite/memcached/t/rpl_memc270_1.test	2012-03-14 11:54:01 +0000
+++ b/mysql-test/suite/memcached/t/rpl_memc270_1.test	2012-03-15 08:56:40 +0000
@@ -1,3 +1,5 @@
+# Test of master and both with slave with memcached access and binlog-format=raw.
+#
 source include/not_windows.inc;
 source include/have_innodb.inc;
 --disable_warnings

=== modified file 'mysql-test/suite/memcached/t/rpl_memc271_2-master.opt'
--- a/mysql-test/suite/memcached/t/rpl_memc271_2-master.opt	2012-03-14 11:54:01 +0000
+++ b/mysql-test/suite/memcached/t/rpl_memc271_2-master.opt	2012-03-15 08:56:40 +0000
@@ -2,6 +2,6 @@ $DAEMON_MEMCACHED_OPT
 $DAEMON_MEMCACHED_LOAD
 --loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
 --log-bin
---binlog-format=row
+--binlog-format=mixed
 --loose-innodb_api_enable_binlog=1
 --loose-daemon_memcached_option="-p11271"

=== modified file 'mysql-test/suite/memcached/t/rpl_memc271_2-slave.opt'
--- a/mysql-test/suite/memcached/t/rpl_memc271_2-slave.opt	2012-03-14 11:54:01 +0000
+++ b/mysql-test/suite/memcached/t/rpl_memc271_2-slave.opt	2012-03-15 08:56:40 +0000
@@ -1 +1 @@
---binlog-format=row
+--binlog-format=mixed

=== modified file 'mysql-test/suite/memcached/t/rpl_memc271_2.test'
--- a/mysql-test/suite/memcached/t/rpl_memc271_2.test	2012-03-14 11:54:01 +0000
+++ b/mysql-test/suite/memcached/t/rpl_memc271_2.test	2012-03-15 08:56:40 +0000
@@ -1,8 +1,8 @@
+# Test of master with memcached access and a slave without memcached, 
+# both with binlog-format=mixed.
+#
 source include/not_windows.inc;
 source include/have_innodb.inc;
---disable_warnings
-source include/master-slave.inc;
---enable_warnings
 
 --disable_query_log
 CALL mtr.add_suppression("daemon-memcached-w-batch-size': unsigned");
@@ -31,6 +31,10 @@ INSERT INTO config_options VALUES("separ
 INSERT INTO containers VALUES ("desc_t1", "test", "t1",
 			       "c1", "c2,c21", "c3", "c4", "c5", "PRIMARY");
 
+--disable_warnings
+source include/master-slave.inc;
+--enable_warnings
+
 USE test;
 
 --disable_warnings
@@ -80,6 +84,7 @@ SELECT c1,c2,c21 FROM t1;
 sync_slave_with_master;
 
 connection slave;
+SHOW CREATE TABLE t1;
 --sorted_result
 SELECT c1,c2,c21 FROM t1;
 
@@ -244,8 +249,9 @@ SELECT c1,c2,c21 FROM t1;
 connection master;
 DROP TABLE t1;
 DROP DATABASE innodb_memcache;
- 
-SET @@global.tx_isolation= @tx_isolation;
 sync_slave_with_master;
 source include/rpl_end.inc;
 
+connection default; 
+SET @@global.tx_isolation= @tx_isolation;
+

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-wl5824 branch (horst.hunger:3859 to 3860) horst.hunger15 Mar