summaryrefslogtreecommitdiff
path: root/mysql-test/main/ps.test
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2019-09-02 14:06:56 +0300
committerMonty <monty@mariadb.org>2019-09-03 13:17:32 +0300
commita071e0e029cd7c155cff1054d9f7f8a6aa898620 (patch)
treeb592c10cb8ca3036688ea19039208eadd485fe7c /mysql-test/main/ps.test
parentb0ff5a6a7393c057cd201aff63279e45d3e0cc49 (diff)
parent9cba6c5aa3b15fffc0ca10e92bcb55a126a20701 (diff)
downloadmariadb-git-a071e0e029cd7c155cff1054d9f7f8a6aa898620.tar.gz
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/main/ps.test')
-rw-r--r--mysql-test/main/ps.test1
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/main/ps.test b/mysql-test/main/ps.test
index 6677c3d8b2a..85ff887f40b 100644
--- a/mysql-test/main/ps.test
+++ b/mysql-test/main/ps.test
@@ -1814,7 +1814,6 @@ drop database mysqltest_1;
deallocate prepare stmt;
set @@character_set_server= @old_character_set_server;
-
#
# BUG#24491 "using alias from source table in insert ... on duplicate key"
#