From: Tor Didriksen Date: October 11 2010 7:13am Subject: bzr commit into mysql-next-mr-merge branch (tor.didriksen:3220) List-Archive: http://lists.mysql.com/commits/120466 Message-Id: <20101011071339.07EFE3723@atum07.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3179597846811137279==" --===============3179597846811137279== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///export/home/didrik/repo/next-mr-merge/ based on revid:tor.didriksen@stripped 3220 Tor Didriksen 2010-10-11 post-merge fix modified: mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result === modified file 'mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result' --- a/mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result 2010-09-02 00:00:20 +0000 +++ b/mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result 2010-10-11 07:13:34 +0000 @@ -26,7 +26,7 @@ ERROR 1050 (42S01) at line 250: Table 's ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists ERROR 1050 (42S01) at line 287: Table 'threads' already exists -ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database. +ERROR 1644 (HY000) at line 705: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed show tables like "user_table"; Tables_in_performance_schema (user_table) @@ -57,7 +57,7 @@ ERROR 1050 (42S01) at line 250: Table 's ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists ERROR 1050 (42S01) at line 287: Table 'threads' already exists -ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database. +ERROR 1644 (HY000) at line 705: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed show tables like "user_view"; Tables_in_performance_schema (user_view) @@ -86,7 +86,7 @@ ERROR 1050 (42S01) at line 250: Table 's ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists ERROR 1050 (42S01) at line 287: Table 'threads' already exists -ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database. +ERROR 1644 (HY000) at line 705: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; name @@ -115,7 +115,7 @@ ERROR 1050 (42S01) at line 250: Table 's ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists ERROR 1050 (42S01) at line 287: Table 'threads' already exists -ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database. +ERROR 1644 (HY000) at line 705: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; name @@ -144,7 +144,7 @@ ERROR 1050 (42S01) at line 250: Table 's ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists ERROR 1050 (42S01) at line 287: Table 'threads' already exists -ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database. +ERROR 1644 (HY000) at line 705: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.event where db='performance_schema'; name --===============3179597846811137279== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/tor.didriksen@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: tor.didriksen@stripped\ # 2vqt6gfysxq6fodu # target_branch: file:///export/home/didrik/repo/next-mr-merge/ # testament_sha1: 10fd7e194ea22ece2bea6b783bb273ebd78cee96 # timestamp: 2010-10-11 09:13:38 +0200 # source_branch: file:///export/home/didrik/repo/trunk-merge-br1/ # base_revision_id: tor.didriksen@stripped\ # s311w604yatqfa34 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQQHhQ4AAcnfgEAQUGP/91ZA liC////wUAP57tsaXDqruaHCSiJgUb1M1NMiPRlNoEaekGgASUminsmjJPImqeAkYT1AGNDUAkiA SYQNKek9NT1M1NA0aYjaQDAaAAAaAAAAAAJJJinpRsmp6HqmBo1DQABoD1La91yZjxw6G3OBnlaC LwWjN6KDUzjZ0U0/GrJmDy+6XSM20NbmjGMU5J5JjvRF7enFGtH2R3oqeX9yRATItpaKGDkRPJG+ vRZ0pzIuFmgjmK4nERpFPcW4xHM84K2VEXP3NSHiO9Yywu7HPutFFgxhSSLoOl4IhFJgZMIYFBn2 zrI2QXBFBSktS36SigeEE8e72kPp4ViG1yEi6kXElfBKRjfDKrYvdHVlMXJ/8z+2SZdqPbGA8rRi ab6ld8ma6mriueE9qFYaLptiDCthUPwhYHN2q5K9/Vb7x4qCcWzWi4cN7ibiqUBQE0ftqKMzbEmX lnFFTzOFuSi4sGaGUClBsWONlFT4OsXWeyqwqim8vMiu49a68Ry3FXFaJaTyxJxTQ5Sa3qLxFtpi GpGYuUMmDML1I2FsAopJqaV1LBmldCJc+Fo2TyxxhSLRmb2SqOvM3UsYkVp+FkTyuWOT3YtKeyBp nBSerOTClWqHkPrlqqYxzM+PKzIIimYmHtPBAjojFHVDERIvjR1RJmmalvxaiEgWVGkz1xhbSmjZ S6wti/u1HPkkQsUkg6AOXPe+Z6InN7ETIbUhmtDMVw0RFA8gwJ0Snhv3blr6YAP4qR3HzL7r+5E7 O/Yh7WJF5sSKLUXomwqUTNRbOrnrzSUYp2iCxoiWIyCNxAFNKRFn5oQ5EAKiGtto9ZYISmu7RfKN nnCpWIlHPRSh+zCW6xseba7K0uLipE0ipG8wTK2b7UTMTqNTyNJwoVBdppvYasU3bccDIa8p84YE uaYVCIRzEUp1wn1oaIoLeZwuJipeipKg10lXbgv3YIoxOIpGtNJi6Boi/96YtmHIOMGu8PTMsoGz ekaA8LOElGiQxPUhsN5X6JFkZo1MqewhcaqSiS6idWRM5NAQ2FRXomgj/kXQu+pZKaGUWTLZ6axy LGcCeHByHmG0RgkMGIC9ybloRny2MyccEQRLp6matV2oK5dnIVt9r4CM0yR3Jg/ExeKv5aioHv7k iwGUNcosy4qWa7aIngjYkYKsusGsr66GoDJvyK7tQyOb4b+YpRgOiL8kRRf57S3m6LY9mKORxGf5 ZBgqpqMs32hIbcx4HVHBG9PZWBiLh6q6x3jGiUTAzamFicJ+0lI/8XckU4UJAEB4UOA= --===============3179597846811137279==--