summaryrefslogtreecommitdiff
path: root/mysql-test/r/mix2_myisam.result
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-12-02 14:34:45 +0100
committerSergei Golubchik <serg@mariadb.org>2016-12-04 01:59:35 +0100
commit7f2fd345004f9774cd1b6e00c8f67e719660cecc (patch)
tree301b756150add731b06fedc48111635342ef4c08 /mysql-test/r/mix2_myisam.result
parentc5ef62159994b45e740a9b3f19c2b9cc8c265916 (diff)
downloadmariadb-git-7f2fd345004f9774cd1b6e00c8f67e719660cecc.tar.gz
MDEV-11231 Server crashes in check_duplicate_key on CREATE TABLE ... SELECT
be consistent and don't include the table name into the error message, no other CREATE TABLE error does it. (the crash happened, because thd->lex->query_tables was NULL)
Diffstat (limited to 'mysql-test/r/mix2_myisam.result')
-rw-r--r--mysql-test/r/mix2_myisam.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/mix2_myisam.result b/mysql-test/r/mix2_myisam.result
index e824db8928a..8aacbf060bd 100644
--- a/mysql-test/r/mix2_myisam.result
+++ b/mysql-test/r/mix2_myisam.result
@@ -257,7 +257,7 @@ drop table t1;
CREATE TABLE t1 (a int not null, b int not null,c int not null,
key(a),primary key(a,b), unique(c),key(a),unique(b)) ENGINE = MyISAM;
Warnings:
-Note 1831 Duplicate index 'a_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note 1831 Duplicate index `a_2`. This is deprecated and will be disallowed in a future release.
show index from t1;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
t1 0 PRIMARY 1 a A # NULL NULL BTREE
@@ -1550,7 +1550,7 @@ alter table t1 add unique(v);
ERROR 23000: Duplicate entry '{ ' for key 'v_2'
alter table t1 add key(v);
Warnings:
-Note 1831 Duplicate index 'v_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note 1831 Duplicate index `v_2`. This is deprecated and will be disallowed in a future release.
select concat('*',v,'*',c,'*',t,'*') as qq from t1 where v='a';
qq
*a*a*a*