List:Commits« Previous MessageNext Message »
From:magnus.blaudd Date:June 16 2011 11:31am
Subject:bzr push into mysql-5.5-cluster branch (magnus.blaudd:3358 to 3359)
Bug#12664797
View as plain text  
 3359 magnus.blaudd@stripped	2011-06-16
      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
 3358 magnus.blaudd@stripped	2011-06-16 [merge]
      Merge 7.1 -> 5.5-cluster

    modified:
      storage/ndb/CMakeLists.txt
      storage/ndb/clusterj/CMakeLists.txt
      storage/ndb/src/CMakeLists.txt
=== modified file 'mysql-test/suite/perfschema/r/pfs_upgrade.result'
--- a/mysql-test/suite/perfschema/r/pfs_upgrade.result	2010-11-08 16:55:38 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade.result	2011-06-16 11:30:28 +0000
@@ -25,7 +25,7 @@ ERROR 1050 (42S01) at line 428: Table 's
 ERROR 1050 (42S01) at line 445: Table 'setup_instruments' already exists
 ERROR 1050 (42S01) at line 461: Table 'setup_timers' already exists
 ERROR 1050 (42S01) at line 478: Table 'threads' already exists
-ERROR 1644 (HY000) at line 1122: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 1414: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
@@ -55,7 +55,7 @@ ERROR 1050 (42S01) at line 428: Table 's
 ERROR 1050 (42S01) at line 445: Table 'setup_instruments' already exists
 ERROR 1050 (42S01) at line 461: Table 'setup_timers' already exists
 ERROR 1050 (42S01) at line 478: Table 'threads' already exists
-ERROR 1644 (HY000) at line 1122: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 1414: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
@@ -83,7 +83,7 @@ ERROR 1050 (42S01) at line 428: Table 's
 ERROR 1050 (42S01) at line 445: Table 'setup_instruments' already exists
 ERROR 1050 (42S01) at line 461: Table 'setup_timers' already exists
 ERROR 1050 (42S01) at line 478: Table 'threads' already exists
-ERROR 1644 (HY000) at line 1122: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 1414: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -111,7 +111,7 @@ ERROR 1050 (42S01) at line 428: Table 's
 ERROR 1050 (42S01) at line 445: Table 'setup_instruments' already exists
 ERROR 1050 (42S01) at line 461: Table 'setup_timers' already exists
 ERROR 1050 (42S01) at line 478: Table 'threads' already exists
-ERROR 1644 (HY000) at line 1122: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 1414: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -139,7 +139,7 @@ ERROR 1050 (42S01) at line 428: Table 's
 ERROR 1050 (42S01) at line 445: Table 'setup_instruments' already exists
 ERROR 1050 (42S01) at line 461: Table 'setup_timers' already exists
 ERROR 1050 (42S01) at line 478: Table 'threads' already exists
-ERROR 1644 (HY000) at line 1122: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 1414: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.event where db='performance_schema';
 name

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5-cluster branch (magnus.blaudd:3358 to 3359)Bug#12664797magnus.blaudd16 Jun