database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl

Browse Source 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl


mysql-test/suite/rpl/r/rpl_loaddata.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_master_pos_wait.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_slave_status.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_master_pos_wait.test:
  Auto merged
mysql-test/suite/rpl/t/rpl_temporary.test:
  Auto merged
mysql-test/suite/rpl/t/rpl_loaddata.test:
  Manual merge. The rpl_loaddata.test file was moved on 5.1 by editing
  the file to include the file at the new location. This causes conflicts
  when merging, since the changes will not propagate to the moved file.
sql/slave.cc:
  Manual merge.
mysql-test/suite/rpl/t/rpl_skip_error.test:
  Manual merge.
mysql-test/suite/rpl/t/rpl_slave_status.test:
  Manual merge.
This commit is contained in:
unknown
2008-03-12 13:07:35 +01:00
parent 875ad6d8b8 0e679ab782
commit 62dee6f718
6 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/rpl/r/rpl_loaddata.result
View File

@ -83,7 +83,8 @@ load data infile '../std_data_ln/rpl_loaddata2.dat' into table t2 fields
terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by
'\n##\n' starting by '>' ignore 1 lines;
ERROR 23000: Duplicate entry '2003-03-22' for key 'day'
drop table t2;
set @@global.sql_slave_skip_counter=1;
start slave;
drop table t2;
drop table t1;
CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=INNODB;