summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_crypt.result
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2017-06-21 16:19:43 +0300
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2017-06-21 16:19:43 +0300
commit2e335a471ced0d86716f8c657f4d67f510712a30 (patch)
tree6fa56f9d9083007e874449b9c2b27579f718ed94 /mysql-test/r/func_crypt.result
parent472c2d9b2fbb262665bdd08338ea902e8398010d (diff)
parent8baf9b0c469e2845d15cc1181bc6b101cdfba087 (diff)
downloadmariadb-git-2e335a471ced0d86716f8c657f4d67f510712a30.tar.gz
Merge remote-tracking branch '10.0' into 10.1
Diffstat (limited to 'mysql-test/r/func_crypt.result')
-rw-r--r--mysql-test/r/func_crypt.result18
1 files changed, 18 insertions, 0 deletions
diff --git a/mysql-test/r/func_crypt.result b/mysql-test/r/func_crypt.result
index a1c33f827c7..2be8ab6c5dd 100644
--- a/mysql-test/r/func_crypt.result
+++ b/mysql-test/r/func_crypt.result
@@ -107,6 +107,24 @@ OLD_PASSWORD(c1) PASSWORD(c1)
DROP TABLE t1;
End of 5.0 tests
#
+# Start of 10.0 tests
+#
+#
+# MDEV-10306 Wrong results with combination of CONCAT, SUBSTR and CONVERT in subquery
+#
+SET @save_optimizer_switch=@@optimizer_switch;
+SET optimizer_switch='derived_merge=on';
+CREATE TABLE t1 (t VARCHAR(32) CHARSET latin1);
+INSERT INTO t1 VALUES('abcdefghi');
+SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT ENCRYPT(t,'aa') t2 FROM t1) sub;
+c2
+aaHHlPHAM4sjs-aaHHlPHAM4sjs
+DROP TABLE t1;
+SET optimizer_switch=@save_optimizer_switch;
+#
+# End of 10.0 tests
+#
+#
# Start of 10.1 tests
#
# Start of func_str_ascii_checksum.inc