From 824cc1c0f2cce5da6fe8b632ca8b3386f34ae50b Mon Sep 17 00:00:00 2001 From: Sergei Golubchik <sergii@pisem.net> Date: Tue, 1 Feb 2011 16:14:00 +0100 Subject: [PATCH] bug in the test case fixed mysql-test/suite/binlog/r/binlog_killed.result: bug in the test case fixed: the function *must* be declared as NOT DETERMINISTIC because it has side effects (it waits on the get_lock() when invoked more than once). When declared DETERMINISTIC, MariaDB feels free to cache the result and shortcut the execution, which breaks the test logic mysql-test/suite/binlog/t/binlog_killed.test: bug in the test case fixed: the function *must* be declared as NOT DETERMINISTIC because it has side effects (it waits on the get_lock() when invoked more than once). When declared DETERMINISTIC, MariaDB feels free to cache the result and shortcut the execution, which breaks the test logic --- mysql-test/suite/binlog/r/binlog_killed.result | 2 +- mysql-test/suite/binlog/t/binlog_killed.test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/binlog/r/binlog_killed.result b/mysql-test/suite/binlog/r/binlog_killed.result index 72fda535b6f..5d699fec314 100644 --- a/mysql-test/suite/binlog/r/binlog_killed.result +++ b/mysql-test/suite/binlog/r/binlog_killed.result @@ -55,7 +55,7 @@ drop table t4; create table t4 (a int, b int) ENGINE=MyISAM /* for killing update and delete */; create function bug27563(n int) RETURNS int(11) -DETERMINISTIC +NOT DETERMINISTIC begin if @b > 0 then select get_lock("a", 20) into @a; diff --git a/mysql-test/suite/binlog/t/binlog_killed.test b/mysql-test/suite/binlog/t/binlog_killed.test index e2db326129d..607fb22cfea 100644 --- a/mysql-test/suite/binlog/t/binlog_killed.test +++ b/mysql-test/suite/binlog/t/binlog_killed.test @@ -218,7 +218,7 @@ create table t4 (a int, b int) ENGINE=MyISAM /* for killing update and delete */ delimiter |; create function bug27563(n int) RETURNS int(11) -DETERMINISTIC +NOT DETERMINISTIC begin if @b > 0 then select get_lock("a", 20) into @a; -- 2.30.9