1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

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
This commit is contained in:
unknown
2006-02-07 19:18:33 +01:00
parent fc45d187f5
commit 7eefe3da4d
5 changed files with 0 additions and 5 deletions

View File

@ -18,4 +18,3 @@ Table Op Msg_type Msg_text
test.non_existing optimize error Table 'test.non_existing' doesn't exist test.non_existing optimize error Table 'test.non_existing' doesn't exist
Warnings: Warnings:
Error 1146 Table 'test.non_existing' doesn't exist Error 1146 Table 'test.non_existing' doesn't exist
drop table t1;

View File

@ -73,4 +73,3 @@ CREATE TABLE t1 ( a INT UNIQUE );
SET FOREIGN_KEY_CHECKS=0; SET FOREIGN_KEY_CHECKS=0;
INSERT INTO t1 VALUES (1),(1); INSERT INTO t1 VALUES (1),(1);
ERROR 23000: Duplicate entry '1' for key 1 ERROR 23000: Duplicate entry '1' for key 1
drop table t1;

View File

@ -79,4 +79,3 @@ terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by
ERROR 23000: Duplicate entry '2003-03-22' for key 1 ERROR 23000: Duplicate entry '2003-03-22' for key 1
drop table t2; drop table t2;
drop table t2; drop table t2;
drop table t1;

View File

@ -12,4 +12,3 @@ count(*)
2 2
show binlog events from 102; show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
drop table t1;

View File

@ -194,4 +194,3 @@ idpro price nbprice
1 1.0000 3 1 1.0000 3
2 1.0000 2 2 1.0000 2
3 2.0000 1 3 2.0000 1
drop table t1, t2;