bzr push into mysql-trunk branch (sneha.modi:3677 to 3678) Bug#6857 Bug#11754150

[Sneha Modi]

 3678 Sneha Modi	2011-12-22 [merge]
      Bug#11754150:  A TEST CASE FOR BUG#6857 IS DISABLED IN SP.TEST
      
      merging from mysql-5.5 -> mysql-trunk

    modified:
      mysql-test/r/sp.result
      mysql-test/t/sp.test
 3677 Dmitry Shulga	2011-12-22
      Follow-up for patch for bug#13070308.
      
      Fixed changes in the result file for xa.test.

    modified:
      mysql-test/r/xa.result
=== modified file 'mysql-test/r/sp.result'
--- a/mysql-test/r/sp.result	2011-12-21 18:02:23 +0000
+++ b/mysql-test/r/sp.result	2011-12-22 11:12:32 +0000
@@ -2724,20 +2724,23 @@ userid
 drop procedure bug8116|
 drop table t3|
 drop procedure if exists bug6857|
-create procedure bug6857(counter int)
+create procedure bug6857()
 begin
 declare t0, t1 int;
 declare plus bool default 0;
-set t0 = current_time();
-while counter > 0 do
-set counter = counter - 1;
-end while;
-set t1 = current_time();
+set t0 = unix_timestamp();
+select sleep(1.1);
+set t1 = unix_timestamp();
 if t1 > t0 then
 set plus = 1;
 end if;
 select plus;
 end|
+call bug6857()|
+sleep(1.1)
+0
+plus
+1
 drop procedure bug6857|
 drop procedure if exists bug8757|
 create procedure bug8757()

=== modified file 'mysql-test/t/sp.test'
--- a/mysql-test/t/sp.test	2011-12-21 18:02:23 +0000
+++ b/mysql-test/t/sp.test	2011-12-22 11:12:32 +0000
@@ -3190,30 +3190,24 @@ drop table t3|
 #
 # BUG#6857: current_time() in STORED PROCEDURES
 #
---disable_warnings ONCE
+--disable_warnings 
 drop procedure if exists bug6857|
-create procedure bug6857(counter int)
+--enable_warnings
+create procedure bug6857()
 begin
   declare t0, t1 int;
   declare plus bool default 0;
 
-  set t0 = current_time();
-  while counter > 0 do
-    set counter = counter - 1;
-  end while;
-  set t1 = current_time();
+  set t0 = unix_timestamp();
+  select sleep(1.1); 
+  set t1 = unix_timestamp();
   if t1 > t0 then
     set plus = 1;
   end if;
   select plus;
 end|
 
-# QQ: This is currently disabled. Not only does it slow down a normal test
-#     run, it makes running with valgrind (or similar tools) extremely
-#     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()|
 
 drop procedure bug6857|
 

No bundle (reason: useless for push emails).