bzr push into mysql-trunk-wl3584 branch (andrei.elkin:3598 to 3599) WL#3584

[Andrei Elkin]

 3599 Andrei Elkin	2012-02-07
      WL#3584 GTID: rpl_mysqlbinlog_gtid_on failure fixing.
      
      Fixed with correcting the test.
     @ mysql-test/suite/rpl/t/rpl_mysqlbinlog_gtid_on.test
        Corrected the syntax of --*clude-skip ranges.
        Notice, the mixed `-' and ',' syntax is not supported.

    modified:
      mysql-test/suite/rpl/r/rpl_mysqlbinlog_gtid_on.result
      mysql-test/suite/rpl/t/rpl_mysqlbinlog_gtid_on.test
 3598 Alfranio Correia	2012-02-06
      Forced collections where gtid is enabled to use servers
      compiled in debug mode.

    modified:
      mysql-test/collections/mysql-trunk-wl3584.push
=== modified file 'mysql-test/suite/rpl/r/rpl_mysqlbinlog_gtid_on.result'
--- a/mysql-test/suite/rpl/r/rpl_mysqlbinlog_gtid_on.result	2012-02-03 09:27:05 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mysqlbinlog_gtid_on.result	2012-02-07 13:28:16 +0000
@@ -18,11 +18,17 @@ INSERT INTO t1 VALUES (NULL) /* 4 */;
 INSERT INTO t1 VALUES (NULL);
 INSERT INTO t1 VALUES (NULL);
 include/diff_tables.inc [master:t1, slave:t1]
+================ --skip-gtid + --exclude-gtid  ================
 INSERT INTO t1 VALUES (NULL) /* 7 */;
 INSERT INTO t1 VALUES (NULL);
-================ --skip-gtid ================
+include/diff_tables.inc [master:t1, slave:t1]
+================ --exclude-gtid ================
 INSERT INTO t1 VALUES (NULL) /* 9 */;
 include/diff_tables.inc [master:t1, slave:t1]
+================ --skip-gtid ================
+FLUSH LOGS;
+INSERT INTO t1 VALUES (NULL) /* 10 */;
+include/diff_tables.inc [master:t1, slave:t1]
 ================ --read-from-remote-master ================
 FLUSH LOGS;
 ================ --read-from-remote-master with --exclude-gtid ================

=== modified file 'mysql-test/suite/rpl/t/rpl_mysqlbinlog_gtid_on.test'
--- a/mysql-test/suite/rpl/t/rpl_mysqlbinlog_gtid_on.test	2012-02-03 09:27:05 +0000
+++ b/mysql-test/suite/rpl/t/rpl_mysqlbinlog_gtid_on.test	2012-02-07 13:28:16 +0000
@@ -52,23 +52,41 @@ INSERT INTO t1 VALUES (NULL) /* 4 */;
 INSERT INTO t1 VALUES (NULL);
 INSERT INTO t1 VALUES (NULL);
 
-#
-# TODO: discuss `:' to `,' change as the comma is the first thing that comes to 
-# anyone's mind when talking on a list of items.
-#
---exec $MYSQL_BINLOG --include-gtid=$server_uuid:4-5:6 $datadir/$binlog_file | $MYSQL --user=root --host=127.0.0.1 --port=$SLAVE_MYPORT
+--exec $MYSQL_BINLOG --include-gtid=$server_uuid:4-6 $datadir/$binlog_file | $MYSQL --user=root --host=127.0.0.1 --port=$SLAVE_MYPORT
 
 --let $diff_tables= master:t1, slave:t1
 --source include/diff_tables.inc
 
+
+--echo ================ --skip-gtid + --exclude-gtid  ================
+
 INSERT INTO t1 VALUES (NULL) /* 7 */;
 INSERT INTO t1 VALUES (NULL);
 
---echo ================ --skip-gtid ================
+--exec $MYSQL_BINLOG --skip-gtid --exclude-gtid=$server_uuid:1-6 $datadir/$binlog_file | $MYSQL --user=root --host=127.0.0.1 --port=$SLAVE_MYPORT
+
+--let $diff_tables= master:t1, slave:t1
+--source include/diff_tables.inc
+
+--echo ================ --exclude-gtid ================
 
 INSERT INTO t1 VALUES (NULL) /* 9 */;
 
---exec $MYSQL_BINLOG --skip-gtid=$server_uuid:1:2:3-8 $datadir/$binlog_file | $MYSQL --user=root --host=127.0.0.1 --port=$SLAVE_MYPORT
+--exec $MYSQL_BINLOG --exclude-gtid=$server_uuid:1-8 $datadir/$binlog_file | $MYSQL --user=root --host=127.0.0.1 --port=$SLAVE_MYPORT
+
+--let $diff_tables= master:t1, slave:t1
+--source include/diff_tables.inc
+
+--echo ================ --skip-gtid ================
+
+FLUSH LOGS;
+--let $server_uuid= `SELECT @@GLOBAL.SERVER_UUID`
+--let $datadir= `SELECT @@datadir`
+--let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1)
+
+INSERT INTO t1 VALUES (NULL) /* 10 */;
+
+--exec $MYSQL_BINLOG --skip-gtid $datadir/$binlog_file | $MYSQL --user=root --host=127.0.0.1 --port=$SLAVE_MYPORT
 
 --let $diff_tables= master:t1, slave:t1
 --source include/diff_tables.inc

No bundle (reason: useless for push emails).