bzr push into mysql-trunk branch (andrei.elkin:3867 to 3869) Bug#13893310

[Andrei Elkin]

 3869 Andrei Elkin	2012-04-12
      BUG#13893310
      
      post-push rpl_mts_debug results mismatch fixing.

    modified:
      mysql-test/suite/rpl/r/rpl_mts_debug.result
      mysql-test/suite/rpl/t/rpl_mts_debug.test
 3868 Andrei Elkin	2012-04-12
      Bug #13893310
      
      Addition to sql_yacc to allow a new token for Change-Master new option
      (to roll in recently added for GTID as well)to be a legal var and sp-label name. 

    modified:
      sql/sql_yacc.yy
 3867 Jimmy Yang	2012-04-12
      Fix Bug 13940669 - 64901: INNODB: ASSERTION FAILURE IN THREAD 34387022112
      IN FILE REM0CMP.CC LINE 5
      
      rb://1024 approved by Sunny Bains

    modified:
      mysql-test/suite/innodb_fts/r/innodb_fts_misc.result
      mysql-test/suite/innodb_fts/t/innodb_fts_misc.test
      storage/innobase/fts/fts0blex.cc
      storage/innobase/fts/fts0blex.l
      storage/innobase/fts/fts0que.cc
      storage/innobase/fts/fts0tlex.cc
      storage/innobase/fts/fts0tlex.l
=== modified file 'mysql-test/suite/rpl/r/rpl_mts_debug.result'
--- a/mysql-test/suite/rpl/r/rpl_mts_debug.result	2012-04-11 16:52:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mts_debug.result	2012-04-12 08:35:58 +0000
@@ -70,7 +70,7 @@ set @@global.slave_parallel_workers= 2;
 include/start_slave.inc
 include/stop_slave.inc
 set @@global.debug= "d,mts_debug_reset_workers_fails";
-change master to relay_log_file='slave-relay-bin.000004', relay_log_pos=274;
+change master to RELAY_LOG_FILE=FILE,  RELAY_LOG_POS= POS;
 ERROR HY000: Cannot clean up worker info tables. Additional error messages can be found in the MySQL error log.
 set @@global.debug= "d,mts_debug_recovery_reset_fails";
 start slave sql_thread;

=== modified file 'mysql-test/suite/rpl/t/rpl_mts_debug.test'
--- a/mysql-test/suite/rpl/t/rpl_mts_debug.test	2012-04-11 16:52:28 +0000
+++ b/mysql-test/suite/rpl/t/rpl_mts_debug.test	2012-04-12 08:35:58 +0000
@@ -164,7 +164,7 @@ set @@global.debug= "d,mts_debug_reset_w
 
 let $relay_file = query_get_value( SHOW SLAVE STATUS, Relay_Log_File, 1 );
 let $relay_pos = query_get_value( SHOW SLAVE STATUS, Relay_Log_Pos, 1 );
---replace_regex /RELAY_LOG_FILE=[^,]+/RELAY_LOG_FILE=FILE/ /RELAY_LOG_POS=[0-9]+/ RELAY_LOG_POS= POS/
+--replace_regex /relay_log_file=[^,]+/RELAY_LOG_FILE=FILE/ /relay_log_pos=[0-9]+/ RELAY_LOG_POS= POS/
 --error ER_MTS_RESET_WORKERS
 eval change master to relay_log_file='$relay_file', relay_log_pos=$relay_pos;
 

=== modified file 'sql/sql_yacc.yy'
--- a/sql/sql_yacc.yy	2012-04-11 16:52:28 +0000
+++ b/sql/sql_yacc.yy	2012-04-12 08:24:17 +0000
@@ -13697,6 +13697,9 @@ keyword_sp:
         | SNAPSHOT_SYM             {}
         | SOUNDS_SYM               {}
         | SOURCE_SYM               {}
+        | SQL_AFTER_GTIDS          {}
+        | SQL_AFTER_MTS_GAPS       {}
+        | SQL_BEFORE_GTIDS         {}
         | SQL_CACHE_SYM            {}
         | SQL_BUFFER_RESULT        {}
         | SQL_NO_CACHE_SYM         {}

No bundle (reason: useless for push emails).