summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <sergefp@mysql.com>2004-12-14 03:37:20 +0300
committerunknown <sergefp@mysql.com>2004-12-14 03:37:20 +0300
commite19a3042efa64cc0ca5142ceeacd40729740eb39 (patch)
tree572218740a9d5a6e3c42a3b563ddb70df9679fa3 /mysql-test/r
parent8322eb0aaaf410819da5eaa95ecd5e3b6ce3c2b0 (diff)
parent8bfe7550073970596cd27ffd8aff55d6af1bf544 (diff)
downloadmariadb-git-e19a3042efa64cc0ca5142ceeacd40729740eb39.tar.gz
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-merge-fix
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/insert_select.result.es7
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/r/insert_select.result.es b/mysql-test/r/insert_select.result.es
index 3955c0534f2..9e11402733d 100644
--- a/mysql-test/r/insert_select.result.es
+++ b/mysql-test/r/insert_select.result.es
@@ -78,6 +78,13 @@ a
1
2
drop table t1, t2;
+create table t1(a int);
+insert into t1 values(1),(1);
+reset master;
+create table t2(unique(a)) select a from t1;
+ERROR 23000: Duplicate entry '1' for key 1
+show binlog events;
+drop table t1;
create table t1 (a int not null);
create table t2 (a int not null);
insert into t1 values (1);