summaryrefslogtreecommitdiff
path: root/mysql-test/extra
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/extra
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/extra')
-rw-r--r--mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
index b41bfeaba74..336b11113ec 100644
--- a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
+++ b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
@@ -228,7 +228,7 @@ rollback;
create table t0 (n int);
insert t0 select * from t1;
set autocommit=1;
-insert into t0 select GET_LOCK("lock1",null);
+insert into t0 select GET_LOCK("lock1",0);
set autocommit=0;
create table t2 (n int) engine=innodb;
insert into t2 values (3);