summaryrefslogtreecommitdiff
path: root/mysql-test/r/mrr_icp_extra.result
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2016-12-24 18:19:21 +0100
committerOlivier Bertrand <bertrandop@gmail.com>2016-12-24 18:19:21 +0100
commit6d2d0a7c3703a0d513427e8ef6b4297ad7081cba (patch)
treec14e831d7a0b086a4a76bed4d05806aea6230432 /mysql-test/r/mrr_icp_extra.result
parente6b563f8be68d57df2a4c9b8e2b6c130855b18e4 (diff)
parent9f863a15b037c0ddffc2d12c1f7d841466f9f345 (diff)
downloadmariadb-git-6d2d0a7c3703a0d513427e8ef6b4297ad7081cba.tar.gz
Merge branch '10.0' of https://github.com/MariaDB/server into ob-10.0
Diffstat (limited to 'mysql-test/r/mrr_icp_extra.result')
-rw-r--r--mysql-test/r/mrr_icp_extra.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/mrr_icp_extra.result b/mysql-test/r/mrr_icp_extra.result
index 855ac4beab5..eaabd3d8119 100644
--- a/mysql-test/r/mrr_icp_extra.result
+++ b/mysql-test/r/mrr_icp_extra.result
@@ -351,7 +351,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*