mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
Bug#11754150: A TEST CASE FOR BUG#6857 IS DISABLED IN SP.TEST
The time comparison using current_time() stored in an int variable was giving wrong results as the current_time() format as an int implementation has been changed in mysql-trunk but not in mysql-5.5. The time is stored in the format hh:mm:ss as 'time' datatype.But as an int, it is stored as hhmmss, but only on the trunk. On mysql-5.5,as an int, it is stored as hh. Hence, the current_time() function has been changed to unix_timestamp() function.
This commit is contained in:
@@ -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()
|
||||
|
||||
@@ -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|
|
||||
|
||||
|
||||
Reference in New Issue
Block a user