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

[Sneha Modi]

 3667 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
 3666 Inaam Rana	2011-12-20
      WL5655: Part 0: dblw batch completion processing in IO thread
      
      rb://848
      approved by: Jimmy
      
      * Current implementation is constrained in a way that it forces the
      calling thread to wait for a batch to complete and then flush all files
      before declaring dblw reusable. This patch off load this to the IO
      helper thread. The calling thread now returns after submitting the
      batch IO requests.
      
      * Also in current design we wait of all IO requests to complete before
      starting the flushing. This won't work when we'll have multiple batches
      running at the same time. This patch introduces a counter in dblw buffer
      to track how many of the IO requests for a given batch has been serviced.

    modified:
      storage/innobase/buf/buf0flu.cc
      storage/innobase/include/trx0sys.h
      storage/innobase/trx/trx0sys.cc
=== modified file 'mysql-test/r/sp.result'
--- a/mysql-test/r/sp.result	2011-12-14 17:08:53 +0000
+++ b/mysql-test/r/sp.result	2011-12-21 09:46:27 +0000
@@ -2728,16 +2728,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()

=== modified file 'mysql-test/t/sp.test'
--- a/mysql-test/t/sp.test	2011-12-14 17:08:53 +0000
+++ b/mysql-test/t/sp.test	2011-12-21 09:46:27 +0000
@@ -3197,11 +3197,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;
@@ -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).