summaryrefslogtreecommitdiff
path: root/mysql-test/r/sp.result
diff options
context:
space:
mode:
authorSneha Modi <sneha.modi@oracle.com>2011-12-21 15:14:55 +0530
committerSneha Modi <sneha.modi@oracle.com>2011-12-21 15:14:55 +0530
commit8a8155f11fd290a95951d41aa29e94fa9f346101 (patch)
tree897bf0237071fca4bb6fc59f8171ab7b2537fc30 /mysql-test/r/sp.result
parented56fa95a0caaa10ef5d20b66aa669f5554e5954 (diff)
downloadmariadb-git-8a8155f11fd290a95951d41aa29e94fa9f346101.tar.gz
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.
Diffstat (limited to 'mysql-test/r/sp.result')
-rw-r--r--mysql-test/r/sp.result7
1 files changed, 5 insertions, 2 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()