summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_misc.result
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2015-07-23 12:50:58 +0400
committerSergey Vojtovich <svoj@mariadb.org>2015-07-29 15:59:56 +0400
commit392df76bc3a40a5dd1956b12628dd6489a37be36 (patch)
treecb3420c2444e778d98330477151ac31300fd9a61 /mysql-test/r/func_misc.result
parente40bc659335f7f8b69427ed2d215c34c045a5ed7 (diff)
downloadmariadb-git-392df76bc3a40a5dd1956b12628dd6489a37be36.tar.gz
MDEV-4017 - GET_LOCK() with negative timeouts has strange behavior
GET_LOCK() silently accepted negative values and NULL for timeout. Fixed GET_LOCK() to issue a warning and return NULL in such cases.
Diffstat (limited to 'mysql-test/r/func_misc.result')
-rw-r--r--mysql-test/r/func_misc.result13
1 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result
index d5db28f04b8..d654dbccb0e 100644
--- a/mysql-test/r/func_misc.result
+++ b/mysql-test/r/func_misc.result
@@ -361,5 +361,18 @@ set optimizer_switch=@optimizer_switch_save;
drop view v_merge, vm;
drop table t1,tv;
#
+# MDEV-4017 - GET_LOCK() with negative timeouts has strange behavior
+#
+SELECT GET_LOCK('ul1', NULL);
+GET_LOCK('ul1', NULL)
+NULL
+Warnings:
+Warning 1411 Incorrect timeout value: 'NULL' for function get_lock
+SELECT GET_LOCK('ul1', -1);
+GET_LOCK('ul1', -1)
+NULL
+Warnings:
+Warning 1411 Incorrect timeout value: '-1' for function get_lock
+#
# End of 5.5 tests
#