diff options
| -rw-r--r-- | mysql-test/r/sp.result | 7 | ||||
| -rw-r--r-- | mysql-test/t/sp.test | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result index 1644c764431..a48f82af915 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -2776,16 +2776,19 @@ create procedure bug6857(counter int) begin declare t0, t1 int; declare plus bool default 0; -set t0 = current_time(); +set t0 = unix_timestamp(); while counter > 0 do set counter = counter - 1; end while; -set t1 = current_time(); +set t1 = unix_timestamp(); if t1 > t0 then set plus = 1; end if; select plus; end| +call bug6857(300000)| +plus +1 drop procedure bug6857| drop procedure if exists bug8757| create procedure bug8757() diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test index 3f6c50a9095..6ac88f4f5bf 100644 --- a/mysql-test/t/sp.test +++ b/mysql-test/t/sp.test @@ -3341,11 +3341,11 @@ begin declare t0, t1 int; declare plus bool default 0; - set t0 = current_time(); + set t0 = unix_timestamp(); while counter > 0 do set counter = counter - 1; end while; - set t1 = current_time(); + set t1 = unix_timestamp(); if t1 > t0 then set plus = 1; end if; @@ -3357,7 +3357,7 @@ end| # painful. # Make sure this takes at least one second on all machines in all builds. # 30000 makes it about 3 seconds on an old 1.1GHz linux. -#call bug6857(300000)| +call bug6857(300000)| drop procedure bug6857| |