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

[Sneha Modi]

 3671 Sneha Modi	2011-12-21
      Bug#11754150: A TEST CASE FOR BUG#6857 IS DISABLED IN SP.TEST
      
      This part of the code is being enabled on mysql-trunk 
      as the time format has been changed on the trunk.

    modified:
      mysql-test/r/sp.result
      mysql-test/t/sp.test
 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
=== modified file 'mysql-test/r/sp.result'
--- a/mysql-test/r/sp.result	2011-12-21 13:31:24 +0000
+++ b/mysql-test/r/sp.result	2011-12-21 13:41:51 +0000
@@ -2738,6 +2738,9 @@ 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 13:31:24 +0000
+++ b/mysql-test/t/sp.test	2011-12-21 13:41:51 +0000
@@ -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).