summaryrefslogtreecommitdiff
path: root/mysql-test/r/rpl_insert_id.result
diff options
context:
space:
mode:
authorunknown <mats@mysql.com>2005-02-23 19:58:54 +0100
committerunknown <mats@mysql.com>2005-02-23 19:58:54 +0100
commit1f2b46fa0f8bb4bd8039b45d73a300efc331722f (patch)
tree82893cc72fc828aba1e57e447573329e17425c52 /mysql-test/r/rpl_insert_id.result
parentcc97be60bac6758f120bd8a7a453831f7614b84c (diff)
parent6a0e1def63b56f0c4c4c5873e70146c731189478 (diff)
downloadmariadb-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/r/rpl_insert_id.result')
-rw-r--r--mysql-test/r/rpl_insert_id.result5
1 files changed, 5 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