bzr push into mysql-5.5 branch (sneha.modi:3661 to 3662) Bug#6857 Bug#11754150

[Sneha Modi]

 3662 Sneha Modi	2011-12-22
      Bug#11754150: A test case for Bug#6857 has been disabled in sp.test:
      
      An extra space was inserted in the code by mistake which was producing a result content mismatch.

    modified:
      mysql-test/t/sp.test
 3661 Sneha Modi	2011-12-22
      Bug#11754150:  A TEST CASE FOR BUG#6857 IS DISABLED IN SP.TEST
      
      unix_timestamp() is implemented in this part of the code in place of current_time().
      Also, since the pb2 machines may be extremely fast, instead of looping through the code,
      we use sleep(1.1) so that the variables t0 and t1 have different values.

    modified:
      mysql-test/r/sp.result
      mysql-test/t/sp.test
=== modified file 'mysql-test/t/sp.test'
--- a/mysql-test/t/sp.test	2011-12-22 11:09:08 +0000
+++ b/mysql-test/t/sp.test	2011-12-22 17:41:48 +0000
@@ -3340,9 +3340,8 @@ create procedure bug6857()
 begin
   declare t0, t1 int;
   declare plus bool default 0;
-
   set t0 = unix_timestamp();
-  select sleep(1.1); 
+  select sleep(1.1);
   set t1 = unix_timestamp();
   if t1 > t0 then
     set plus = 1;

No bundle (reason: useless for push emails).