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 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0

Browse Source 
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
This commit is contained in:
unknown
2005-02-24 03:28:33 +02:00
parent 0613ed1f0e 8cb66fe618
commit c3d916b52c
3 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/r/rpl_insert_id.result
View File

@ -68,3 +68,8 @@ b c
9 13 9 13
drop table t1; drop table t1;
drop table t2; drop table t2;
SET TIMESTAMP=1000000000;
CREATE TABLE t1 ( a INT UNIQUE );
SET FOREIGN_KEY_CHECKS=0;
INSERT INTO t1 VALUES (1),(1);
Duplicate entry '1' for key 1

16
mysql-test/t/rpl_insert_id.test
View File

@ -61,3 +61,19 @@ drop table t2;
save_master_pos; save_master_pos;
connection slave; connection slave;
sync_with_master; sync_with_master;
#
# Bug#8412: Error codes reported in binary log for CHARACTER SET,
# FOREIGN_KEY_CHECKS
#
connection master;
SET TIMESTAMP=1000000000;
CREATE TABLE t1 ( a INT UNIQUE );
SET FOREIGN_KEY_CHECKS=0;
--error 1062
INSERT INTO t1 VALUES (1),(1);
sync_slave_with_master;

4
sql/log.cc
View File

@ -1737,7 +1737,9 @@ COLLATION_CONNECTION=%u,COLLATION_DATABASE=%u,COLLATION_SERVER=%u",
} }
} }
/* Write the SQL command */ /*
Write the SQL command
*/
if (event_info->write(file)) if (event_info->write(file))
goto err; goto err;