From: Sneha Modi
Date: December 20 2011 10:18am
Subject: bzr push into mysql-trunk branch (sneha.modi:3676 to 3677) Bug#6857
 Bug#11754150
List-Archive: http://lists.mysql.com/commits/142188
X-Bug: 6857,11754150
Message-Id: <201112201018.pBKAIYk8022245@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3677 Sneha Modi	2011-12-20
      Bug#11754150:  A TEST CASE FOR BUG#6857 IS DISABLED IN SP.TEST
      
      This part has been enabled and the data-type for variables t0 and t1 in this part of the code has been 
      changed from int to time.

    modified:
      mysql-test/r/sp.result
      mysql-test/t/sp.test
 3676 Sneha Modi	2011-12-14
      Bug#11754150: 45707: A TEST CASE FOR BUG#6857 IS DISABLED IN SP.TEST
      
      This code is enabled as the test does not fail on enabling this part.Pushing this code
      to mysql-trunk-itch to monitor it's behaviour on pb2.

    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-14 11:14:23 +0000
+++ b/mysql-test/r/sp.result	2011-12-20 10:16:03 +0000
@@ -2726,7 +2726,7 @@ drop table t3|
 drop procedure if exists bug6857|
 create procedure bug6857(counter int)
 begin
-declare t0, t1 int;
+declare t0, t1 time;
 declare plus bool default 0;
 set t0 = current_time();
 while counter > 0 do
@@ -2740,9 +2740,7 @@ select plus;
 end|
 call bug6857(300000)|
 plus
-0
-Warnings:
-Warning 1265    Data truncated for column 't1' at row 1
+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 11:14:23 +0000
+++ b/mysql-test/t/sp.test	2011-12-20 10:16:03 +0000
@@ -3194,7 +3194,7 @@ drop table t3|
 drop procedure if exists bug6857|
 create procedure bug6857(counter int)
 begin
-  declare t0, t1 int;
+  declare t0, t1 time;
   declare plus bool default 0;
 
   set t0 = current_time();

No bundle (reason: useless for push emails).