bzr commit into mysql-5.1-telco-6.3 branch (frazer:3399)

[Frazer Clement]

#At file:///home/frazer/bzr/mysql-5.1-telco-6.3/ based on revid:frazer@stripped

 3399 Frazer Clement	2011-03-15
      Make ndb_binlog_ignore_db deterministic wrt epoch boundaries

    modified:
      mysql-test/suite/ndb_binlog/r/ndb_binlog_ignore_db.result
      mysql-test/suite/ndb_binlog/t/ndb_binlog_ignore_db.test
=== modified file 'mysql-test/suite/ndb_binlog/r/ndb_binlog_ignore_db.result'
--- a/mysql-test/suite/ndb_binlog/r/ndb_binlog_ignore_db.result	2011-03-14 23:28:51 +0000
+++ b/mysql-test/suite/ndb_binlog/r/ndb_binlog_ignore_db.result	2011-03-15 10:49:09 +0000
@@ -47,16 +47,9 @@ delete from t1;
 drop table t1;
 drop database test2;
 -- Should have events in Binlog, *including ndb_apply_status*
-show binlog events from <binlog_start>;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-mysqld-bin.000001	#	Query	1	#	create database test2
-mysqld-bin.000001	#	Query	1	#	use `test2`; create table t1 (a int primary key) engine=ndb
-mysqld-bin.000001	#	Query	1	#	BEGIN
-mysqld-bin.000001	#	Table_map	1	#	table_id: # (test2.t1)
-mysqld-bin.000001	#	Table_map	1	#	table_id: # (mysql.ndb_apply_status)
-mysqld-bin.000001	#	Write_rows	1	#	table_id: #
-mysqld-bin.000001	#	Write_rows	1	#	table_id: #
-mysqld-bin.000001	#	Delete_rows	1	#	table_id: # flags: STMT_END_F
-mysqld-bin.000001	#	Query	1	#	COMMIT
-mysqld-bin.000001	#	Query	1	#	use `test2`; drop table t1
-mysqld-bin.000001	#	Query	1	#	drop database test2
+use test;
+create table raw_binlog_rows (txt varchar(1000));
+select count(1) > 0 from raw_binlog_rows where txt like '%ndb_apply_status%';
+count(1) > 0
+1
+drop table raw_binlog_rows;

=== modified file 'mysql-test/suite/ndb_binlog/t/ndb_binlog_ignore_db.test'
--- a/mysql-test/suite/ndb_binlog/t/ndb_binlog_ignore_db.test	2011-03-14 23:28:51 +0000
+++ b/mysql-test/suite/ndb_binlog/t/ndb_binlog_ignore_db.test	2011-03-15 10:49:09 +0000
@@ -65,5 +65,15 @@ drop table t1;
 drop database test2;
 
 --echo -- Should have events in Binlog, *including ndb_apply_status*
--- source include/show_binlog_events2.inc
+use test;
+create table raw_binlog_rows (txt varchar(1000));
+--disable_query_log
+let $MYSQLD_DATADIR= `select @@datadir;`;
+--exec $MYSQL_BINLOG --verbose $MYSQLD_DATADIR/mysqld-bin.000001 > $MYSQLTEST_VARDIR/tmp/ndb_binlog_mysqlbinlog.sql
 
+--eval load data local infile '$MYSQLTEST_VARDIR/tmp/ndb_binlog_mysqlbinlog.sql' into table raw_binlog_rows columns terminated by '\n';
+--enable_query_log
+
+select count(1) > 0 from raw_binlog_rows where txt like '%ndb_apply_status%';
+
+drop table raw_binlog_rows;
\ No newline at end of file


Attachment: [text/bzr-bundle] bzr/[e-mail]