summaryrefslogtreecommitdiff
path: root/mysql-test/t/func_set.test
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2013-08-08 11:48:49 +0400
committerAlexander Barkov <bar@mariadb.org>2013-08-08 11:48:49 +0400
commit62484d2e23e15831260a3874748f58c6fda2f346 (patch)
treeaa8af729f6edc93795b4dc20b398de642015bebe /mysql-test/t/func_set.test
parent220623572ddd463efb64f38284cce03545f52262 (diff)
parente6a6f653a9c67741f67df9448b3182066939283c (diff)
downloadmariadb-git-62484d2e23e15831260a3874748f58c6fda2f346.tar.gz
Merge from 5.3
pending merges: Alexander Barkov 2013-08-08 MDEV-4512 Valgrind warnings in my_long10_to_...
Diffstat (limited to 'mysql-test/t/func_set.test')
-rw-r--r--mysql-test/t/func_set.test17
1 files changed, 17 insertions, 0 deletions
diff --git a/mysql-test/t/func_set.test b/mysql-test/t/func_set.test
index 3531864c860..ba984113fd7 100644
--- a/mysql-test/t/func_set.test
+++ b/mysql-test/t/func_set.test
@@ -99,6 +99,23 @@ SELECT CONVERT( a USING latin1 ) FROM t2;
DROP TABLE t1, t2;
--echo #
+--echo # Start of 5.3 tests
+--echo #
+
+--echo #
+--echo # MDEV-4512 Valgrind warnings in my_long10_to_str_8bit on INTERVAL and DATE_ADD with incorrect types
+--echo #
+CREATE TABLE t1 (pk INT PRIMARY KEY);
+INSERT INTO t1 VALUES (10),(11);
+SELECT INTERVAL( 9, 1, DATE_ADD( pk, INTERVAL pk MINUTE_SECOND ), 9, 8, 3, 5, 2, 1 ) FROM t1;
+DROP TABLE t1;
+
+--echo #
+--echo # End of 5.3 tests
+--echo #
+
+
+--echo #
--echo # BUG#59405: FIND_IN_SET won't work normaly after upgrade from 5.1 to 5.5
--echo #