Commit 03830dd6 authored by unknown's avatar unknown
Browse files

Updated row result, and fix for Windows build. 


CMakeLists.txt:
  Fix for Windows build
mysql-test/r/binlog_row_binlog.result:
  Updated row result
mysql-test/r/multi_update.result:
  Updated row result
mysql-test/t/multi_update.test:
  Updated row result
parent 1363c9b2

CMakeLists.txt

+0 −3
Original line number Diff line number Diff line
@@ -131,9 +131,6 @@ ADD_SUBDIRECTORY(client) 
IF(WITH_ARCHIVE_STORAGE_ENGINE)

  ADD_SUBDIRECTORY(storage/archive)

ENDIF(WITH_ARCHIVE_STORAGE_ENGINE)

IF(WITH_BERKELEY_STORAGE_ENGINE)

  ADD_SUBDIRECTORY(storage/bdb)

ENDIF(WITH_BERKELEY_STORAGE_ENGINE)

IF(WITH_BLACKHOLE_STORAGE_ENGINE)

  ADD_SUBDIRECTORY(storage/blackhole)

ENDIF(WITH_BLACKHOLE_STORAGE_ENGINE)

mysql-test/r/binlog_row_binlog.result

+3 −3
Original line number Diff line number Diff line 
drop table if exists t1, t2;

reset master;

create table t1 (a int) engine=bdb;

create table t1 (a int) engine=innodb;

create table t2 (a int) engine=innodb;

begin;

insert t1 values (5);
@@ -10,12 +10,12 @@ insert t2 values (5); 
commit;

show binlog events from 102;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	1	#	use `test`; create table t1 (a int) engine=bdb

master-bin.000001	#	Query	1	#	use `test`; create table t1 (a int) engine=innodb

master-bin.000001	#	Query	1	#	use `test`; create table t2 (a int) engine=innodb

master-bin.000001	#	Query	1	#	use `test`; BEGIN

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

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

master-bin.000001	#	Query	1	#	use `test`; COMMIT

master-bin.000001	#	Xid	1	#	COMMIT /* xid= */

master-bin.000001	#	Query	1	#	use `test`; BEGIN

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

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

mysql-test/r/multi_update.result

+1 −1
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ create table t2 like t1; 
insert into t2 select * from t1;

delete t1,t2 from t2,t1 where t1.a<'B' and t2.b=t1.b;

drop table t1,t2;

create table t1 ( c char(8) not null ) engine=bdb;

create table t1 ( c char(8) not null ) engine=innodb;

insert into t1 values ('0'),('1'),('2'),('3'),('4'),('5'),('6'),('7'),('8'),('9');

insert into t1 values ('A'),('B'),('C'),('D'),('E'),('F');

alter table t1 add b char(8) not null;

mysql-test/t/multi_update.test

+1 −1
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ delete t1,t2 from t2,t1 where t1.a<'B' and t2.b=t1.b; 
drop table t1,t2;



--disable_warnings

create table t1 ( c char(8) not null ) engine=bdb;

create table t1 ( c char(8) not null ) engine=innodb;

--enable_warnings



insert into t1 values ('0'),('1'),('2'),('3'),('4'),('5'),('6'),('7'),('8'),('9');