From: Alexander Nozdrin Date: October 27 2010 7:17am Subject: bzr push into mysql-5.5-bugteam branch (alexander.nozdrin:3100 to 3101) Bug#55850 List-Archive: http://lists.mysql.com/commits/122122 X-Bug: 55850 Message-Id: <201010270718.o9R7IXmC013718@rcsinet15.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3101 Alexander Nozdrin 2010-10-27 Follow-up for Bug#55850: update funcs_1 result files. modified: mysql-test/suite/funcs_1/r/innodb_trig_08.result mysql-test/suite/funcs_1/r/memory_trig_08.result mysql-test/suite/funcs_1/r/myisam_trig_08.result 3100 Anitha Gopi 2010-10-27 [merge] Up merge revision 3547 from 5.1. Enable sp_sync test since Bug 48157 is fixed modified: mysql-test/suite/binlog/t/disabled.def mysql-test/t/disabled.def === modified file 'mysql-test/suite/funcs_1/r/innodb_trig_08.result' --- a/mysql-test/suite/funcs_1/r/innodb_trig_08.result 2010-03-19 08:56:26 +0000 +++ b/mysql-test/suite/funcs_1/r/innodb_trig_08.result 2010-10-27 07:16:52 +0000 @@ -353,8 +353,6 @@ B Test 3.5.8.5-case 00191 0000000016 C=o C Test 3.5.8.5-case 00200 0000000001 C=one Insert into tb3 (f120, f122, f136) values ('d', 'Test 3.5.8.5-case', 152); -Warnings: -Warning 1265 Data truncated for column 'f120' at row 1 select f120, f122, f136, f144, @test_var from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136; f120 f122 f136 f144 @test_var @@ -364,8 +362,6 @@ B Test 3.5.8.5-case 00191 0000000016 1*0 C Test 3.5.8.5-case 00200 0000000001 1*0000099999 Insert into tb3 (f120, f122, f136, f144) values ('e', 'Test 3.5.8.5-case', 200, 8); -Warnings: -Warning 1265 Data truncated for column 'f120' at row 1 select f120, f122, f136, f144, @test_var from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136; f120 f122 f136 f144 @test_var === modified file 'mysql-test/suite/funcs_1/r/memory_trig_08.result' --- a/mysql-test/suite/funcs_1/r/memory_trig_08.result 2010-03-19 08:56:26 +0000 +++ b/mysql-test/suite/funcs_1/r/memory_trig_08.result 2010-10-27 07:16:52 +0000 @@ -354,8 +354,6 @@ B Test 3.5.8.5-case 00191 0000000016 C=o C Test 3.5.8.5-case 00200 0000000001 C=one Insert into tb3 (f120, f122, f136) values ('d', 'Test 3.5.8.5-case', 152); -Warnings: -Warning 1265 Data truncated for column 'f120' at row 1 select f120, f122, f136, f144, @test_var from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136; f120 f122 f136 f144 @test_var @@ -365,8 +363,6 @@ B Test 3.5.8.5-case 00191 0000000016 1*0 C Test 3.5.8.5-case 00200 0000000001 1*0000099999 Insert into tb3 (f120, f122, f136, f144) values ('e', 'Test 3.5.8.5-case', 200, 8); -Warnings: -Warning 1265 Data truncated for column 'f120' at row 1 select f120, f122, f136, f144, @test_var from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136; f120 f122 f136 f144 @test_var === modified file 'mysql-test/suite/funcs_1/r/myisam_trig_08.result' --- a/mysql-test/suite/funcs_1/r/myisam_trig_08.result 2010-03-19 08:56:26 +0000 +++ b/mysql-test/suite/funcs_1/r/myisam_trig_08.result 2010-10-27 07:16:52 +0000 @@ -354,8 +354,6 @@ B Test 3.5.8.5-case 00191 0000000016 C=o C Test 3.5.8.5-case 00200 0000000001 C=one Insert into tb3 (f120, f122, f136) values ('d', 'Test 3.5.8.5-case', 152); -Warnings: -Warning 1265 Data truncated for column 'f120' at row 1 select f120, f122, f136, f144, @test_var from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136; f120 f122 f136 f144 @test_var @@ -365,8 +363,6 @@ B Test 3.5.8.5-case 00191 0000000016 1*0 C Test 3.5.8.5-case 00200 0000000001 1*0000099999 Insert into tb3 (f120, f122, f136, f144) values ('e', 'Test 3.5.8.5-case', 200, 8); -Warnings: -Warning 1265 Data truncated for column 'f120' at row 1 select f120, f122, f136, f144, @test_var from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136; f120 f122 f136 f144 @test_var No bundle (reason: useless for push emails).