From: Alexander Nozdrin Date: October 27 2010 7:16am Subject: bzr commit into mysql-5.5-bugteam branch (alexander.nozdrin:3101) Bug#55850 List-Archive: http://lists.mysql.com/commits/122036 X-Bug: 55850 Message-Id: <201010270718.o9R5OH6E032368@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8037344644941059860==" --===============8037344644941059860== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/alik/MySQL/bzr/00/bug55850/mysql-5.5-bugteam-bug55850/ based on revid:anitha.gopi@stripped 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 === 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 --===============8037344644941059860== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/alexander.nozdrin@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: alexander.nozdrin@stripped\ # 33kwq0f46rlun8s7 # target_branch: file:///home/alik/MySQL/bzr/00/bug55850/mysql-5.5-\ # bugteam-bug55850/ # testament_sha1: 053f166f525be9703c3c939feca25ad8ed1248ea # timestamp: 2010-10-27 11:16:57 +0400 # base_revision_id: anitha.gopi@stripped\ # c68bflj3aje0nw63 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZeQCLUAArTfgAAQWGP/93MB AAC////wUAVZ7zed23TNnrpr1p7u973e4IqTUGg1NtUZPTTIJmoNA0aDBJRNBlT8IiZ6oxHqAB6g AAkiE0T0IamaRoDTIaGg00ARSQphphR6CejUaGmgBoaaAioRoEZGmg0p4p6aR6j1PRJ6g9QosQ4Y Hpsw0mAYrLGiWnEkoCYKoQaD3RyrvWKYGTC4eYcY1ULdcIs7hgxmGTXjhKeUp8m9W/Hv+0edjVBu gJ6XajHhne8XGbsqPUZQF9+m+0fgA5CSrZr6HIXN9vwYyA0vC/lQZ7Kso61OP0zNalqFzNmxPOzi aoQjCUOYemACQtAwjW7ap2I48hSE4hzigsU5gxmsDO0V1FYPkarkImlMMmKJLN4BmxC5S8OBuj1a 7HW+z9UMp6zK8NqJdcdYSqIxKi02Le5GwWRJVUlODRZLVgIw0FMh7ygFPEqse9FSPE3H1JlpjAdx 8ny3suBC90wFT0CXPVOhcEDBXUFBTyZUlDvdYlXbO1hCCGnOsYCd0g9XhnfO0Q5bKLJ50B/GJuH4 7p6zic2T9nKohsz4FtgzEi7rLlifvxSSCtiZEKitzwuNC5tQa1ftNIYlY5YnLKOX0VoVwFbJFX4Z 6EgSEjynRydUTpu0Jp7BMjXtKe50OxrJiWnqSYBpIOwbm6AkRMSfUwkMy+otimbZbaGCs28QyEk5 Bq2BSbx7GjS5QHpnIWQnbS64JK8KNzEQVFNSZaRih42rrcUUTBlCt7gMMbmhSt6JNnpJqtTok6Gq aIViqm1/ANtqsMFe8E45/D5mp5fq867oQIBA/zTKiPZDmFDZgxQwaLqEPY7F5GEaHZuIgZUFTBz6 8Q4HnwpqsDrUaqRxNZqCDVzsyTtTLH0BneFKFRshoLi6gqIYMrB+54fJ3D4bg6BnpOTzNjWRe57t FjoPwjjYHSdmTrkyoVITCI4vDcHDyHNgdxYkeiAn6mAaN5y8OXbUbzE1WpRXUksyVK2/nk8voHEs ByqDuDZX7PpAWYe7ednXqeN+wMjYGIXcyQeAxfu15IMpoMmgfWNpRdLXQ69ttUC3YbmeU8MXOYzv ELWCYmaPCOjrw62UsKxN76kRmDSt5PAeBIMhNkBBIvA2hIkEwa+ssD0dz7hS4Sd+diXy+JYheXL6 NGCZOYFt4S5wzOLxNfXUsJ8wpQ3iRDuiDnHLhOP5ppvyHtNJtOT4DU53dc3HuZG4NzyOjelRgUmg m3v0Gk0CdiY6agpOheN/ApD0ZqQX51g9Hf7abdDENLLoJQUgFcIMmDcdfTcc88ynINxtUywsk6gV 3ion1qAh1FIbYqZ1nGQM8sUzJwaVOBWHeQ0QkPg6aXQ5Gz9rEJx33j2cX+pvGZ5OaLqdFtJlOlKk cG5CuyCYjeYF1wQCpJ3GYaLMRaUUzqKBNRjzdiaJSQKKEOg4wb+0gqr2oeQdAlwyownQsNp/IjQE 80VLcXm1lRSEymXMty5MzM28MiKxTTibRjad9YV4GMz5DJ4sLG/ek75yWN1DC+4dPDMWF7aWDDch HNCZNzg7GZ18dBlbCBxwJaJqZBsYnLKdxrKzS4O0dsX7ESs/ZpaCIkwcCC5Dg2sAwLSd5EGAVP/i 7kinChIS8gEWoA== --===============8037344644941059860==--