From: magnus.blaudd Date: June 27 2011 12:21pm Subject: bzr commit into mysql-trunk-cluster branch (magnus.blaudd:3329) Bug#12664797 List-Archive: http://lists.mysql.com/commits/139903 X-Bug: 12664797 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0108171966046161033==" --===============0108171966046161033== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///data0/magnus/mysql/trunk-cluster/ based on revid:magnus.blaudd@stripped 3329 magnus.blaudd@stripped 2011-06-27 Bug #12664797 PFS_UPGRADE.RESULT LINE NUMBER DIFF WHEN MYSQL_SYSTEM_TABLES.SQL MODIFIED - Update line numbers after adding more SQL to mysql_system_tables.sql modified: mysql-test/suite/perfschema/r/pfs_upgrade.result === modified file 'mysql-test/suite/perfschema/r/pfs_upgrade.result' --- a/mysql-test/suite/perfschema/r/pfs_upgrade.result 2011-05-17 09:15:47 +0000 +++ b/mysql-test/suite/perfschema/r/pfs_upgrade.result 2011-06-27 12:20:46 +0000 @@ -41,7 +41,7 @@ ERROR 1050 (42S01) at line 643: Table 'e ERROR 1050 (42S01) at line 686: Table 'events_statements_history_long' already exists ERROR 1050 (42S01) at line 718: Table 'events_statements_summary_by_thread_by_event_name' already exists ERROR 1050 (42S01) at line 749: Table 'events_statements_summary_global_by_event_name' already exists -ERROR 1644 (HY000) at line 1169: Unexpected content found in the performance_schema database. +ERROR 1644 (HY000) at line 1374: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed show tables like "user_table"; Tables_in_performance_schema (user_table) @@ -87,7 +87,7 @@ ERROR 1050 (42S01) at line 643: Table 'e ERROR 1050 (42S01) at line 686: Table 'events_statements_history_long' already exists ERROR 1050 (42S01) at line 718: Table 'events_statements_summary_by_thread_by_event_name' already exists ERROR 1050 (42S01) at line 749: Table 'events_statements_summary_global_by_event_name' already exists -ERROR 1644 (HY000) at line 1169: Unexpected content found in the performance_schema database. +ERROR 1644 (HY000) at line 1374: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed show tables like "user_view"; Tables_in_performance_schema (user_view) @@ -131,7 +131,7 @@ ERROR 1050 (42S01) at line 643: Table 'e ERROR 1050 (42S01) at line 686: Table 'events_statements_history_long' already exists ERROR 1050 (42S01) at line 718: Table 'events_statements_summary_by_thread_by_event_name' already exists ERROR 1050 (42S01) at line 749: Table 'events_statements_summary_global_by_event_name' already exists -ERROR 1644 (HY000) at line 1169: Unexpected content found in the performance_schema database. +ERROR 1644 (HY000) at line 1374: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; name @@ -175,7 +175,7 @@ ERROR 1050 (42S01) at line 643: Table 'e ERROR 1050 (42S01) at line 686: Table 'events_statements_history_long' already exists ERROR 1050 (42S01) at line 718: Table 'events_statements_summary_by_thread_by_event_name' already exists ERROR 1050 (42S01) at line 749: Table 'events_statements_summary_global_by_event_name' already exists -ERROR 1644 (HY000) at line 1169: Unexpected content found in the performance_schema database. +ERROR 1644 (HY000) at line 1374: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; name @@ -219,7 +219,7 @@ ERROR 1050 (42S01) at line 643: Table 'e ERROR 1050 (42S01) at line 686: Table 'events_statements_history_long' already exists ERROR 1050 (42S01) at line 718: Table 'events_statements_summary_by_thread_by_event_name' already exists ERROR 1050 (42S01) at line 749: Table 'events_statements_summary_global_by_event_name' already exists -ERROR 1644 (HY000) at line 1169: Unexpected content found in the performance_schema database. +ERROR 1644 (HY000) at line 1374: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.event where db='performance_schema'; name --===============0108171966046161033== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/magnus.blaudd@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: magnus.blaudd@stripped\ # a9d684uz60apjhmt # target_branch: file:///data0/magnus/mysql/trunk-cluster/ # testament_sha1: 8187e0d0f1b7fe8f2ea8ce71585a85f6e2285a5f # timestamp: 2011-06-27 14:21:31 +0200 # source_branch: file:///data0/magnus/mysql/5.5-cluster/ # base_revision_id: magnus.blaudd@stripped\ # wr37sgamdw218hfk # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUz0OLMAAeTfgAAQWGP/93fn /qC////wUARBlvQ7qNBxW6CSQgKeTVPwE0AU0jNR6nom8pmTRT2qG1AklTyTxDJoIp5ooA0AAMga AAJQRNUfqaZAnojTTQyDIGgAAAHMAmAmRgBGJiYTCYIaYmmAkoE0aU8SHplA2k0AaAABoAFWEwM3 SnqVX6oEuZwpwXnY99oXyXww8XokhbwnYGZenNKyEjS+SPBD9bXtE9w4jdXEziP7ft3/O2j4o3/T 266kc0ckS+vviiITIhr7db+xzkMGpFuGU2d7unenMj6JbIkOmKIz2EV5dorpI/63klQWopm18/lq ERiTV25wt0xE0Kirnw1IOqHog8FURHZsdyUBvYiJtEAR7DAKtMlIowizXLUUm/WY1QkqPuPozqTB NJmd3RiT4QrQeETrs89KW7OcblknT9c1RIxZR2IsUTj68eiax0K8lvtxgm3dhC2xsEy/ivcOFQhO r+aB7PxeGzQYm13PBpYyxMI4zJRFVFJMWpiKlIe5pS6BKIrBjaJ/CwxB4VRsN7UjgLOF8edUPLNB oDihrkNEV01Ba68s532LF8nlp3tw/GeTkoM3+Fggg5Flud6U20BjfPmTtUUFeztq4oi4go4a0oqZ YWqZbhnkK8exbsusoSHpqlHkSzK8kYTrSVooPQisydbGtdWKgtEnIsiyWJEKJLVqN27r5r7qYuy8 8R9v5jnZMdOX77Gdp9OP4m9KPTdSjjV5SHqdeiIUEnsT/Dq6sXy02xbQaPemBCXxqkg4jS7h/m5W 0zE0kSxCqNDnbct7Bz83IeeHSJMjujDu7m/jxFwnF0OXkkXMqpX5oBmEaPH1VtESI+Avw+lHNDqE N9RNiI+fDiNb91pPHyMyHk94h83H88ALqad3LdkiWsfQQ06kPcyRuqkYcETR8mFJGNtAeX3sKEFB M9cREkcqiKkOIRaDpipkYQ2PwRYiCRMm6bto6zLT25sYZmdPOEqKde+5EyIqDZlHU110uba26xxC pDIkPdMnYNe1aMcXYZUEyVSJU/YbcK8R7bdP6GhjY8qqP81b9WhW3IgVMiovUdMW+XOoJKNSDwxF I9Faw/IqkozXUUfLvTRbDFOLRbwzi7I+WeyFobw2ulwF7Y2N+tYWh73BIJNB26IwMskhg7JeJmpg Eo1iKRWr3PgY0yIYxTyCL6i51UIGYTphTkwOmFOiAh/khplfUlBDE9ijnEOV+3nibm/XfjBUBxtR YQP1IpC+kDc9UvRDXXizK+B/yIIk0aGzrIVLp+wyijct6rJJGwmBfFszUcylhYQFmiBUWuxQIPYr tMQ9+CjFD5ov8ybg1nIGkvFbj63FxsnIHJo8SfQhkZnFHbSQfbGQovM+VCUKEK7j4S1aZCdllRCQ TBz9i03aSEeqklC5Esk94ilBbFmFy1mnASzY8JpdvFjkR/4u5IpwoSCZ6HFm --===============0108171966046161033==--