3889 magnus.blaudd@stripped 2012-04-19
binlog
- fix trivial .result file mismatch, apparently the .test file or one
of teh include files it uses has been changed to use
"show_binlog_events.inc" instead of the raw "show binlog events" command
modified:
mysql-test/suite/binlog/r/binlog_multi_engine.result
3888 magnus.blaudd@stripped 2012-04-19
ndb
- fix comipilation error in ha_ndbcluster_binlog.cc due to recent proper
interface to the global threads list in MySQl Server fix
modified:
sql/ha_ndbcluster_binlog.cc
=== modified file 'mysql-test/suite/binlog/r/binlog_multi_engine.result'
--- a/mysql-test/suite/binlog/r/binlog_multi_engine.result 2011-09-07 10:08:09 +0000
+++ b/mysql-test/suite/binlog/r/binlog_multi_engine.result 2012-04-19 11:20:54 +0000
@@ -19,7 +19,7 @@ COMMIT;
TRUNCATE t1m;
TRUNCATE t1b;
TRUNCATE t1n;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
Log_name Pos Event_type Server_id End_log_pos Info
mysqld-bin.000001 # Query # # BEGIN
mysqld-bin.000001 # Query # # use `test`; INSERT INTO t1b VALUES (1,1), (1,2), (2,1), (2,2)
@@ -52,7 +52,7 @@ ERROR HY000: Cannot execute statement: i
TRUNCATE t1m;
TRUNCATE t1b;
TRUNCATE t1n;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
Log_name Pos Event_type Server_id End_log_pos Info
mysqld-bin.000001 # Query # # BEGIN
mysqld-bin.000001 # Query # # use `test`; INSERT INTO t1b VALUES (1,1), (1,2), (2,1), (2,2)
@@ -81,7 +81,7 @@ UPDATE t1m, t1n SET m = 2, e = 3 WHERE n
ERROR HY000: Cannot execute statement: impossible to write to binary log since more than one engine is involved and at least one engine is self-logging.
UPDATE t1n, t1b SET e = 2, b = 3 WHERE f = c;
ERROR HY000: Cannot execute statement: impossible to write to binary log since more than one engine is involved and at least one engine is self-logging.
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
Log_name Pos Event_type Server_id End_log_pos Info
mysqld-bin.000001 # Query # # BEGIN
mysqld-bin.000001 # Table_map # # table_id: # (test.t1m)
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk branch (magnus.blaudd:3888 to 3889) | magnus.blaudd | 20 Apr |
