#At file:///home/acorreia/workspace.sun/repository.mysql.new/bzrwork/tmp/BUG-53452/mysql-5.5-bugfixing/ based on revid:holyfoot@stripped
3194 Alfranio Correia 2010-08-25
Post-fix push for BUG#53452.
Updated the result files for ndb test cases.
modified:
mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result
mysql-test/suite/ndb/r/ndb_binlog_ignore_db.result
mysql-test/suite/ndb/r/ndb_binlog_log_bin.result
mysql-test/suite/ndb/r/ndb_binlog_multi.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result
mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result
=== modified file 'mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result'
--- a/mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result 2007-12-19 16:16:22 +0000
+++ b/mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result 2010-08-25 14:13:20 +0000
@@ -193,4 +193,4 @@ mysqld-bin.000001 # Table_map 2 # table_
mysqld-bin.000001 # Write_rows 2 # table_id: #
mysqld-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F
mysqld-bin.000001 # Query 2 # COMMIT
-mysqld-bin.000001 # Query 2 # use `test`; drop table t2
+mysqld-bin.000001 # Query 2 # use `test`; DROP TABLE `t2` /* generated by server */
=== modified file 'mysql-test/suite/ndb/r/ndb_binlog_ignore_db.result'
--- a/mysql-test/suite/ndb/r/ndb_binlog_ignore_db.result 2007-12-19 16:16:22 +0000
+++ b/mysql-test/suite/ndb/r/ndb_binlog_ignore_db.result 2010-08-25 14:13:20 +0000
@@ -7,5 +7,5 @@ create table t1 (a int primary key, b in
insert into t1 values (1, 1);
show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info
-mysqld-bin.000001 # Query 1 # use `test`; drop table if exists t1
+mysqld-bin.000001 # Query 1 # use `test`; DROP TABLE IF EXISTS `t1` /* generated by server */
drop database mysqltest;
=== modified file 'mysql-test/suite/ndb/r/ndb_binlog_log_bin.result'
--- a/mysql-test/suite/ndb/r/ndb_binlog_log_bin.result 2007-12-19 16:16:22 +0000
+++ b/mysql-test/suite/ndb/r/ndb_binlog_log_bin.result 2010-08-25 14:13:20 +0000
@@ -47,8 +47,8 @@ mysqld-bin.000001 # Table_map 1 # table_
mysqld-bin.000001 # Write_rows 1 # table_id: #
mysqld-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
mysqld-bin.000001 # Query 1 # COMMIT
-mysqld-bin.000001 # Query 1 # use `mysqltest`; drop table t1
-mysqld-bin.000001 # Query 1 # use `mysqltest`; drop table t2
+mysqld-bin.000001 # Query 1 # use `mysqltest`; DROP TABLE `t1` /* generated by server */
+mysqld-bin.000001 # Query 1 # use `mysqltest`; DROP TABLE `t2` /* generated by server */
mysqld-bin.000001 # Query 1 # use `mysqltest`; create table t1 (d int key, e int) engine=ndb
mysqld-bin.000001 # Query 1 # use `mysqltest`; create table t2 (d int key, e int) engine=ndb
mysqld-bin.000001 # Query 1 # BEGIN
=== modified file 'mysql-test/suite/ndb/r/ndb_binlog_multi.result'
--- a/mysql-test/suite/ndb/r/ndb_binlog_multi.result 2007-12-19 16:16:22 +0000
+++ b/mysql-test/suite/ndb/r/ndb_binlog_multi.result 2010-08-25 14:13:20 +0000
@@ -37,7 +37,7 @@ mysqld-bin.000001 # Table_map 1 # table_
mysqld-bin.000001 # Write_rows 1 # table_id: #
mysqld-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
mysqld-bin.000001 # Query 1 # COMMIT
-mysqld-bin.000001 # Query 1 # use `test`; DROP TABLE t2
+mysqld-bin.000001 # Query 1 # use `test`; DROP TABLE `t2` /* generated by server */
SELECT inserts,updates,deletes,schemaops FROM
mysql.ndb_binlog_index WHERE epoch=<the_epoch>;
inserts updates deletes schemaops
@@ -73,7 +73,7 @@ mysqld-bin.000001 # Table_map 2 # table_
mysqld-bin.000001 # Write_rows 2 # table_id: #
mysqld-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F
mysqld-bin.000001 # Query 2 # COMMIT
-mysqld-bin.000001 # Query 2 # use `test`; drop table t1
+mysqld-bin.000001 # Query 2 # use `test`; DROP TABLE `t1` /* generated by server */
SELECT inserts,updates,deletes,schemaops FROM
mysql.ndb_binlog_index WHERE epoch > <the_epoch> AND epoch <= <the_epoch2>;
inserts updates deletes schemaops
=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result 2010-05-26 14:34:25 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result 2010-08-25 14:13:20 +0000
@@ -25,7 +25,7 @@ master-bin.000001 # Table_map # # table_
master-bin.000001 # Write_rows # # table_id: #
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT
-master-bin.000001 # Query # # use `test`; drop table t1
+master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */
master-bin.000001 # Query # # use `test`; create table t1 (word char(20) not null)ENGINE=NDB
master-bin.000001 # Query # # BEGIN
master-bin.000001 # Table_map # # table_id: # (test.t1)
@@ -204,7 +204,7 @@ master-bin.000001 # Table_map # # table_
master-bin.000001 # Write_rows # # table_id: #
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT
-master-bin.000001 # Query # # use `test`; drop table t1
+master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */
master-bin.000001 # Query # # use `test`; create table t1 (word char(20) not null)ENGINE=NDB
master-bin.000001 # Query # # BEGIN
master-bin.000001 # Table_map # # table_id: # (test.t1)
@@ -240,7 +240,7 @@ slave-bin.000001 # Table_map # # table_i
slave-bin.000001 # Write_rows # # table_id: #
slave-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
slave-bin.000001 # Query # # COMMIT
-slave-bin.000001 # Query # # use `test`; drop table t1
+slave-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */
slave-bin.000001 # Query # # use `test`; create table t1 (word char(20) not null)ENGINE=NDB
slave-bin.000001 # Query # # BEGIN
slave-bin.000001 # Table_map # # table_id: # (test.t1)
=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result 2010-05-26 14:34:25 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result 2010-08-25 14:13:20 +0000
@@ -37,7 +37,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT
master-bin.000001 # Query # # use `test`; TRUNCATE TABLE t1
-master-bin.000001 # Query # # use `test`; DROP TABLE t1
+master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */
**** On Master ****
CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB;
INSERT INTO t1 VALUES (1,1), (2,2);
@@ -72,7 +72,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT
master-bin.000001 # Query # # use `test`; TRUNCATE TABLE t1
-master-bin.000001 # Query # # use `test`; DROP TABLE t1
+master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB
master-bin.000001 # Query # # BEGIN
master-bin.000001 # Table_map # # table_id: # (test.t1)
@@ -86,4 +86,4 @@ master-bin.000001 # Table_map # # table_
master-bin.000001 # Write_rows # # table_id: #
master-bin.000001 # Delete_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT
-master-bin.000001 # Query # # use `test`; DROP TABLE t1
+master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */
Attachment: [text/bzr-bundle] bzr/alfranio.correia@oracle.com-20100825141320-3j9v4unbyuk2g0na.bundle
| Thread |
|---|
| • bzr commit into mysql-5.5-bugfixing branch (alfranio.correia:3194) Bug#53452 | Alfranio Correia | 25 Aug |
