Commit 4cb86e6e authored by unknown's avatar unknown
Browse files

revert back to old show_binlog_events asto many test failures, and create a... 

revert back to old show_binlog_events asto many test failures, and create a show_binlog_events2 instead


BitKeeper/etc/ignore:
  Added client/log_event_old.cc client/log_event_old.h client/rpl_record_old.cc client/rpl_record_old.h libmysqld/log_event_old.cc libmysqld/rpl_record.cc libmysqld/rpl_record_old.cc to the ignore list
mysql-test/include/show_binlog_events2.inc:
  New BitKeeper file ``mysql-test/include/show_binlog_events2.inc''
parent 852bac88

.bzrignore

+7 −0
Original line number Diff line number Diff line
@@ -2957,3 +2957,10 @@ win/vs8cache.txt 
zlib/*.ds?

zlib/*.vcproj

client/rpl_constants.h

client/log_event_old.cc

client/log_event_old.h

client/rpl_record_old.cc

client/rpl_record_old.h

libmysqld/log_event_old.cc

libmysqld/rpl_record.cc

libmysqld/rpl_record_old.cc

mysql-test/include/show_binlog_events.inc

+1 −1
Original line number Diff line number Diff line 
--let $binlog_start=106

--replace_result $binlog_start <binlog_start>

--replace_column 2 # 5 #

--replace_column 2 # 4 # 5 #

--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/

--eval show binlog events from $binlog_start

mysql-test/include/show_binlog_events2.inc

0 → 100644
+9 −0
Original line number Diff line number Diff line 
#

# Differs slightly from show_binlog events in showing server_id

# which is important for some tests

#

--let $binlog_start=106

--replace_result $binlog_start <binlog_start>

--replace_column 2 # 5 #

--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/

--eval show binlog events from $binlog_start

mysql-test/r/rpl_ndb_dd_basic.result

+12 −12
Original line number Diff line number Diff line
@@ -34,33 +34,33 @@ pk1 b c 
1	2	3

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS t1

master-bin.000001	#	Query	#	#	CREATE LOGFILE GROUP lg1

master-bin.000001	#	Query	1	#	use `test`; DROP TABLE IF EXISTS t1

master-bin.000001	#	Query	1	#	CREATE LOGFILE GROUP lg1

ADD UNDOFILE 'undofile.dat'

INITIAL_SIZE 16M

UNDO_BUFFER_SIZE = 1M

ENGINE=NDB

master-bin.000001	#	Query	#	#	alter logfile group lg1

master-bin.000001	#	Query	1	#	alter logfile group lg1

add undofile 'undofile02.dat'

initial_size 4M engine=ndb

master-bin.000001	#	Query	#	#	CREATE TABLESPACE ts1

master-bin.000001	#	Query	1	#	CREATE TABLESPACE ts1

ADD DATAFILE 'datafile.dat'

USE LOGFILE GROUP lg1

INITIAL_SIZE 12M

ENGINE NDB

master-bin.000001	#	Query	#	#	alter tablespace ts1

master-bin.000001	#	Query	1	#	alter tablespace ts1

add datafile 'datafile02.dat'

initial_size 4M engine=ndb

master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1

master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE t1

(pk1 int not null primary key, b int not null, c int not null)

tablespace ts1 storage disk

engine ndb

master-bin.000001	#	Query	#	#	BEGIN

master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)

master-bin.000001	#	Table_map	#	#	table_id: # (mysql.ndb_apply_status)

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	1	#	BEGIN

master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)

master-bin.000001	#	Table_map	1	#	table_id: # (mysql.ndb_apply_status)

master-bin.000001	#	Write_rows	1	#	table_id: #

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	1	#	COMMIT

drop table t1;

alter tablespace ts1

drop datafile 'datafile.dat'

mysql-test/t/ndb_binlog_ddl_multi.test

+10 −10
Original line number Diff line number Diff line
@@ -31,10 +31,10 @@ create table t1 (a int primary key) engine=ndb; 


--connection server2

create table t2 (a int primary key) engine=ndb;

--source include/show_binlog_events.inc

--source include/show_binlog_events2.inc



--connection server1

--source include/show_binlog_events.inc

--source include/show_binlog_events2.inc



# alter table

--connection server1
@@ -46,7 +46,7 @@ reset master; 
alter table t2 add column (b int);



--connection server1

--source include/show_binlog_events.inc

--source include/show_binlog_events2.inc



# alter database

--connection server1
@@ -64,10 +64,10 @@ ALTER DATABASE mysqltest CHARACTER SET latin1; 
drop table mysqltest.t1;



--connection server1

--source include/show_binlog_events.inc

--source include/show_binlog_events2.inc

# to track down bug#18976

--real_sleep 10

--source include/show_binlog_events.inc

--source include/show_binlog_events2.inc



#--connection server2

#drop table mysqltest.t1;
@@ -85,7 +85,7 @@ drop database mysqltest; 
create table t1 (a int primary key) engine=ndb;



--connection server2

--source include/show_binlog_events.inc

--source include/show_binlog_events2.inc



--connection server2

drop table t2;
@@ -137,10 +137,10 @@ ENGINE =NDB; 
#drop table t1;



--connection server2

--source include/show_binlog_events.inc

--source include/show_binlog_events2.inc

# to track down bug#18976

--real_sleep 10

--source include/show_binlog_events.inc

--source include/show_binlog_events2.inc



drop table t1;
@@ -161,7 +161,7 @@ create table t2 (a int key) engine=ndb; 
create table t3 (a int key) engine=ndb;

rename table t3 to t4, t2 to t3, t1 to t2, t4 to t1;

--connection server2

--source include/show_binlog_events.inc

--source include/show_binlog_events2.inc



drop table t1;

drop table t2;
@@ -188,4 +188,4 @@ insert into t2 values(2); 
# prior to bug fix, data was missing for t2

--connection server2

drop table t2;

--source include/show_binlog_events.inc
 
--source include/show_binlog_events2.inc