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

[Sneha Modi]

 3670 Sneha Modi	2011-12-21 [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
 3669 Vasil Dimov	2011-12-21
      Fix some debug printouts in row0sel.cc

    modified:
      storage/innobase/row/row0sel.cc
=== modified file 'mysql-test/r/sp.result'
--- a/mysql-test/r/sp.result	2011-12-21 09:46:27 +0000
+++ b/mysql-test/r/sp.result	2011-12-21 13:31:24 +0000
@@ -2728,19 +2728,16 @@ create procedure bug6857(counter int)
 begin
 declare t0, t1 int;
 declare plus bool default 0;
-set t0 = unix_timestamp();
+set t0 = current_time();
 while counter > 0 do
 set counter = counter - 1;
 end while;
-set t1 = unix_timestamp();
+set t1 = current_time();
 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()

=== modified file 'mysql-test/t/sp.test'
--- a/mysql-test/t/sp.test	2011-12-21 09:46:27 +0000
+++ b/mysql-test/t/sp.test	2011-12-21 13:31:24 +0000
@@ -3197,11 +3197,11 @@ begin
   declare t0, t1 int;
   declare plus bool default 0;
 
-  set t0 = unix_timestamp();
+  set t0 = current_time();
   while counter > 0 do
     set counter = counter - 1;
   end while;
-  set t1 = unix_timestamp();
+  set t1 = current_time();
   if t1 > t0 then
     set plus = 1;
   end if;
@@ -3213,7 +3213,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|
 

No bundle (reason: useless for push emails).