Commit 7eefe3da authored by unknown's avatar unknown
Browse files

Update after merge 5.0 -> 5.1 


mysql-test/r/rpl_failed_optimize.result:
  Updates test result
mysql-test/r/rpl_insert_id.result:
  Updates test result
mysql-test/r/rpl_loaddata.result:
  Updates test result
mysql-test/r/rpl_loaddata_s.result:
  Updates test result
mysql-test/r/rpl_multi_update3.result:
  Updates test result
parent fc45d187

mysql-test/r/rpl_failed_optimize.result

+0 −1
Original line number Diff line number Diff line
@@ -18,4 +18,3 @@ Table Op Msg_type Msg_text 
test.non_existing	optimize	error	Table 'test.non_existing' doesn't exist

Warnings:

Error	1146	Table 'test.non_existing' doesn't exist
 
drop table t1;

mysql-test/r/rpl_insert_id.result

+0 −1
Original line number Diff line number Diff line
@@ -73,4 +73,3 @@ CREATE TABLE t1 ( a INT UNIQUE ); 
SET FOREIGN_KEY_CHECKS=0;

INSERT INTO t1 VALUES (1),(1);

ERROR 23000: Duplicate entry '1' for key 1
 
drop table t1;

mysql-test/r/rpl_loaddata.result

+0 −1
Original line number Diff line number Diff line
@@ -79,4 +79,3 @@ terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by 
ERROR 23000: Duplicate entry '2003-03-22' for key 1

drop table t2;

drop table t2;
 
drop table t1;

mysql-test/r/rpl_loaddata_s.result

+0 −1
Original line number Diff line number Diff line
@@ -12,4 +12,3 @@ count(*) 
2

show binlog events from 102;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 
drop table t1;

mysql-test/r/rpl_multi_update3.result

+0 −1
Original line number Diff line number Diff line
@@ -194,4 +194,3 @@ idpro price nbprice 
1	1.0000	3

2	1.0000	2

3	2.0000	1
 
drop table t1, t2;