bzr commit into mysql-trunk-cluster branch (magnus.blaudd:3329) Bug#12664797

[magnus.blaudd]

#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


Attachment: [text/bzr-bundle] bzr/[e-mail]