mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 12:32:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug#8412: merged from 4.1

Browse source 
sql/log.cc:
  Merge from 4.1
This commit is contained in:
unknown 2005-02-23 23:01:51 +01:00
commit 91251238b4
3 changed files with 24 additions and 1 deletions
Show stats 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
drop table t1;
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;
connection slave;
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))
goto err;