summaryrefslogtreecommitdiff
path: root/mysql-test/suite/maria
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2017-05-17 00:00:27 +0300
committerMonty <monty@mariadb.org>2017-05-17 00:00:27 +0300
commitf7dab76aa286560d167c666e058a494e93c04da5 (patch)
treed9b5cc348a3387717f3a9ebbd28cc3b2a5da8f26 /mysql-test/suite/maria
parentca7cf69cb13285585922722063af888b957580ee (diff)
downloadmariadb-git-f7dab76aa286560d167c666e058a494e93c04da5.tar.gz
MDEV-12756 rpl.rpl_killed_ddl fails in buildbot with 'Can't find record'
The issue was that my_errno was not set properly when a repair was killed, which confused the rpl_killed_ddl script. I also added an extra test line in varchar.inc to ensure we don't give duplicate error rows.
Diffstat (limited to 'mysql-test/suite/maria')
-rw-r--r--mysql-test/suite/maria/maria.result3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/suite/maria/maria.result b/mysql-test/suite/maria/maria.result
index 04b042059fb..88f39827f27 100644
--- a/mysql-test/suite/maria/maria.result
+++ b/mysql-test/suite/maria/maria.result
@@ -1145,6 +1145,9 @@ id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ref v v 13 const # Using where; Using index
alter table t1 add unique(v);
ERROR 23000: Duplicate entry '{ ' for key 'v_2'
+show warnings;
+Level Code Message
+Error 1062 Duplicate entry 'a' for key 'v_2'
alter table t1 add key(v);
Warnings:
Note 1831 Duplicate index `v_2`. This is deprecated and will be disallowed in a future release