From: Alexander Nozdrin Date: October 27 2010 7:19am Subject: bzr push into mysql-trunk-bugfixing branch (alexander.nozdrin:3292 to 3293) List-Archive: http://lists.mysql.com/commits/122037 Message-Id: <201010270720.o9R57o86021913@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3293 Alexander Nozdrin 2010-10-27 [merge] Auto-merge from mysql-5.5-bugteam. 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 3292 Anitha Gopi 2010-10-27 [merge] Merge revision 3100 from mysql-5.5-bugfixing 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).