List:Commits« Previous MessageNext Message »
From:Luis Soares Date:December 17 2011 5:57am
Subject:bzr push into mysql-trunk-wl3584 branch (luis.soares:3539 to 3541) WL#3584
View as plain text  
 3541 Luis Soares	2011-12-17
      WL#3584
      
      Added have_debug to rpl_check_gtid test case.

    modified:
      mysql-test/suite/rpl/t/rpl_check_gtid.test
 3540 Luis Soares	2011-12-17 [merge]
      WL#3584
      
      Auto-merged from wl3584 bug fixing clone into latest feature clone.

    modified:
      mysql-test/suite/binlog/r/binlog_innodb.result
      mysql-test/suite/perfschema/r/binlog_mix.result
      sql/log_event.cc
 3539 Luis Soares	2011-12-16 [merge]
      WL#3584
      
      Automerge test fixing branch into latest snapshot of the feature tree.

    modified:
      mysql-test/include/mysqlbinlog_row_engine.inc
      mysql-test/r/mysqlbinlog_row.result
      mysql-test/r/mysqlbinlog_row_innodb.result
      mysql-test/r/mysqlbinlog_row_myisam.result
      mysql-test/r/mysqlbinlog_row_trans.result
      mysql-test/suite/binlog/r/binlog_database.result
      mysql-test/suite/binlog/r/binlog_delete_and_flush_index.result
      mysql-test/suite/binlog/r/binlog_drop_if_exists.result
      mysql-test/suite/binlog/r/binlog_implicit_commit.result
      mysql-test/suite/binlog/r/binlog_rewrite.result
      mysql-test/suite/binlog/r/binlog_server_id.result
      mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result
      mysql-test/suite/binlog/r/binlog_stm_drop_tbl.result
      mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result
      mysql-test/suite/binlog/r/binlog_stm_insert_select.result
      mysql-test/t/mysqlbinlog_row.test
      mysql-test/t/mysqlbinlog_row_trans.test
=== modified file 'mysql-test/suite/binlog/r/binlog_innodb.result'
--- a/mysql-test/suite/binlog/r/binlog_innodb.result	2011-11-18 16:39:51 +0000
+++ b/mysql-test/suite/binlog/r/binlog_innodb.result	2011-12-17 05:41:24 +0000
@@ -65,7 +65,7 @@ UPDATE t1 SET b = 4*a WHERE a > 4;
 COMMIT;
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	GtidSet	#	#	GROUPS: GTID:(X,X)
+master-bin.000001	#	Previous_gtids	#	#	
 master-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=INNODB
 master-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
@@ -174,7 +174,7 @@ a	b
 # There must no UPDATE in binlog;
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	GtidSet	#	#	GROUPS: GTID:(X,X)
+master-bin.000001	#	Previous_gtids	#	#	
 delete from t1;
 delete from t2;
 insert into t1 values (1,2),(3,4),(4,4);
@@ -185,6 +185,6 @@ ERROR 23000: Duplicate entry '4' for key
 # There must be no UPDATE query event;
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	GtidSet	#	#	GROUPS: GTID:(X,X)
+master-bin.000001	#	Previous_gtids	#	#	
 drop table t1, t2;
 End of tests

=== modified file 'mysql-test/suite/perfschema/r/binlog_mix.result'
--- a/mysql-test/suite/perfschema/r/binlog_mix.result	2011-11-18 16:39:51 +0000
+++ b/mysql-test/suite/perfschema/r/binlog_mix.result	2011-12-17 05:41:24 +0000
@@ -26,7 +26,7 @@ update performance_schema.setup_instrume
   and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock");
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	GtidSet	#	#	GROUPS: GTID:(X,X)
+master-bin.000001	#	Previous_gtids	#	#	
 master-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (performance_schema.setup_instruments)

=== modified file 'mysql-test/suite/rpl/t/rpl_check_gtid.test'
--- a/mysql-test/suite/rpl/t/rpl_check_gtid.test	2011-12-16 16:47:32 +0000
+++ b/mysql-test/suite/rpl/t/rpl_check_gtid.test	2011-12-17 05:55:56 +0000
@@ -49,6 +49,9 @@
 --source include/not_embedded.inc
 --source include/not_windows.inc
 
+# tests needs debug build
+--source include/have_debug.inc
+
 call mtr.add_suppression("Recovery from master pos .*");
 
 --let $master_uuid= query_get_value(SELECT @@SERVER_UUID, @@SERVER_UUID, 1)

=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2011-12-16 10:18:35 +0000
+++ b/sql/log_event.cc	2011-12-17 05:19:06 +0000
@@ -11595,7 +11595,8 @@ Gtid_log_event::Gtid_log_event(THD *thd_
 : Log_event(thd_arg, spec_arg->type == ANONYMOUS_GROUP ?
             LOG_EVENT_IGNORABLE_F : 0,
             using_trans ? Log_event::EVENT_TRANSACTIONAL_CACHE :
-            Log_event::EVENT_STMT_CACHE, Log_event::EVENT_NORMAL_LOGGING)
+            Log_event::EVENT_STMT_CACHE, Log_event::EVENT_NORMAL_LOGGING),
+  commit_flag(true)
 {
   DBUG_ENTER("Gtid_log_event::Gtid_log_event(THD *, const Gtid_specification *)");
   DBUG_ASSERT(spec_arg->type != AUTOMATIC_GROUP);
@@ -11610,7 +11611,8 @@ Gtid_log_event::Gtid_log_event(THD* thd_
 : Log_event(thd_arg, thd_arg->variables.gtid_next.type == ANONYMOUS_GROUP ?
             LOG_EVENT_IGNORABLE_F : 0,
             using_trans ? Log_event::EVENT_TRANSACTIONAL_CACHE :
-            Log_event::EVENT_STMT_CACHE, Log_event::EVENT_NORMAL_LOGGING)
+            Log_event::EVENT_STMT_CACHE, Log_event::EVENT_NORMAL_LOGGING),
+  commit_flag(true)
 {
   DBUG_ENTER("Gtid_log_event::Gtid_log_event(THD *)");
   spec= thd_arg->variables.gtid_next;
@@ -11861,6 +11863,7 @@ st_print_event_info::st_print_event_info
    auto_increment_increment(0),auto_increment_offset(0), charset_inited(0),
    lc_time_names_number(~0),
    charset_database_number(ILLEGAL_CHARSET_INFO_NUMBER),
+   thread_id(0), thread_id_printed(false),
    base64_output_mode(BASE64_OUTPUT_UNSPEC), printed_fd_event(FALSE),
    have_unflushed_events(FALSE)
 {

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-wl3584 branch (luis.soares:3539 to 3541) WL#3584Luis Soares19 Dec