diff options
| author | unknown <mats@mysql.com> | 2005-02-23 19:58:54 +0100 |
|---|---|---|
| committer | unknown <mats@mysql.com> | 2005-02-23 19:58:54 +0100 |
| commit | 1f2b46fa0f8bb4bd8039b45d73a300efc331722f (patch) | |
| tree | 82893cc72fc828aba1e57e447573329e17425c52 /mysql-test | |
| parent | cc97be60bac6758f120bd8a7a453831f7614b84c (diff) | |
| parent | 6a0e1def63b56f0c4c4c5873e70146c731189478 (diff) | |
| download | mariadb-git-1f2b46fa0f8bb4bd8039b45d73a300efc331722f.tar.gz | |
Bug#8412: Merge from 4.0
mysql-test/r/rpl_insert_id.result:
Auto merged
mysql-test/t/rpl_insert_id.test:
Auto merged
sql/log.cc:
Merge from 4.0
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/rpl_insert_id.result | 5 | ||||
| -rw-r--r-- | mysql-test/t/rpl_insert_id.test | 16 |
2 files changed, 21 insertions, 0 deletions
diff --git a/mysql-test/r/rpl_insert_id.result b/mysql-test/r/rpl_insert_id.result index 8001cb59a35..514ab60dafe 100644 --- a/mysql-test/r/rpl_insert_id.result +++ b/mysql-test/r/rpl_insert_id.result @@ -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 diff --git a/mysql-test/t/rpl_insert_id.test b/mysql-test/t/rpl_insert_id.test index 4c27c03af60..a4506e32963 100644 --- a/mysql-test/t/rpl_insert_id.test +++ b/mysql-test/t/rpl_insert_id.test @@ -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; + + + + |