MDEV-27964: Test ENCRYPT() only in main.func_crypt

MariaDB · Mar 1, 2022 · fd5a6d0 · fd5a6d0
1 parent 07f4a4a
commit fd5a6d0
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 18 deletions.
diff --git a/mysql-test/main/func_crypt.result b/mysql-test/main/func_crypt.result
@@ -230,3 +230,13 @@ a	b
 hello	12NKz5XM5JeKI
 DROP TABLE t1;
 # End of 10.2 tests
+#
+# MDEV-25778 Overrun buffer in to_string_native()
+#
+CREATE TABLE t1 (a DECIMAL(15,11) ZEROFILL);
+INSERT INTO t1 (a) VALUES (0.1),(0.2);
+SELECT length(ENCRYPT(a)) AS f, COUNT(*) FROM t1 GROUP BY f;
+f	COUNT(*)
+13	2
+DROP TABLE t1;
+# End of 10.6 tests
diff --git a/mysql-test/main/func_crypt.test b/mysql-test/main/func_crypt.test
@@ -149,3 +149,14 @@ SELECT * FROM t1;
 DROP TABLE t1;
 
 --echo # End of 10.2 tests
+
+--echo #
+--echo # MDEV-25778 Overrun buffer in to_string_native()
+--echo #
+
+CREATE TABLE t1 (a DECIMAL(15,11) ZEROFILL);
+INSERT INTO t1 (a) VALUES (0.1),(0.2);
+SELECT length(ENCRYPT(a)) AS f, COUNT(*) FROM t1 GROUP BY f;
+DROP TABLE t1;
+
+--echo # End of 10.6 tests
diff --git a/mysql-test/main/strings.result b/mysql-test/main/strings.result
@@ -9,15 +9,6 @@ ERROR HY000: \042D\0442\0443 \043E\043F\0435\0440\0430\0446\0438\044E \043D\0435
 STOP SLAVE;
 RESET SLAVE ALL;
 #
-# MDEV-25778 Overrun buffer in to_string_native()
-#
-CREATE TABLE t1 (a DECIMAL(15,11) ZEROFILL);
-INSERT INTO t1 (a) VALUES (0.1),(0.2);
-SELECT length(ENCRYPT(a)) AS f, COUNT(*) FROM t1 GROUP BY f;
-f	COUNT(*)
-13	2
-DROP TABLE t1;
-#
 # MDEV-25754 ASAN: stack-buffer-overflow in Field_newdate::val_str
 #
 CREATE TABLE t1 (d DATE);

diff --git a/mysql-test/main/strings.test b/mysql-test/main/strings.test
@@ -16,15 +16,6 @@ CHANGE MASTER TO master_user='user',master_password='pwd';
 STOP SLAVE;
 RESET SLAVE ALL;
 
---echo #
---echo # MDEV-25778 Overrun buffer in to_string_native()
---echo #
-
-CREATE TABLE t1 (a DECIMAL(15,11) ZEROFILL);
-INSERT INTO t1 (a) VALUES (0.1),(0.2);
-SELECT length(ENCRYPT(a)) AS f, COUNT(*) FROM t1 GROUP BY f;
-DROP TABLE t1;
-
 --echo #
 --echo # MDEV-25754 ASAN: stack-buffer-overflow in Field_newdate::val_str
 --echo #