List:Commits« Previous MessageNext Message »
From:Davi Arnaut Date:July 15 2010 9:58pm
Subject:bzr push into mysql-trunk-merge branch (davi:3125 to 3126) Bug#53613
View as plain text  
 3126 Davi Arnaut	2010-07-15
      Bug#53613: mysql_upgrade incorrectly revokes ...
      
      Post-merge fix: adjust line numbers in pfs_upgrade test case
      result given that mysql_system_tables_fix.sql was modified.

    modified:
      mysql-test/suite/perfschema/r/pfs_upgrade.result
 3125 Davi Arnaut	2010-07-15
      Strip maintainer mode options from the flags written to
      mysql_config. Those are mainly warning options intended
      to monitor the server code and shouldn't be leaked to
      client code.

    modified:
      scripts/CMakeLists.txt
=== modified file 'mysql-test/suite/perfschema/r/pfs_upgrade.result'
--- a/mysql-test/suite/perfschema/r/pfs_upgrade.result	2010-04-15 08:12:03 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade.result	2010-07-15 21:57:47 +0000
@@ -26,7 +26,7 @@ ERROR 1050 (42S01) at line 445: Table 'S
 ERROR 1050 (42S01) at line 462: Table 'SETUP_INSTRUMENTS' already exists
 ERROR 1050 (42S01) at line 482: Table 'SETUP_OBJECTS' already exists
 ERROR 1050 (42S01) at line 498: Table 'SETUP_TIMERS' already exists
-ERROR 1644 (HY000) at line 1140: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 1138: 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 445: Table 'S
 ERROR 1050 (42S01) at line 462: Table 'SETUP_INSTRUMENTS' already exists
 ERROR 1050 (42S01) at line 482: Table 'SETUP_OBJECTS' already exists
 ERROR 1050 (42S01) at line 498: Table 'SETUP_TIMERS' already exists
-ERROR 1644 (HY000) at line 1140: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 1138: 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 445: Table 'S
 ERROR 1050 (42S01) at line 462: Table 'SETUP_INSTRUMENTS' already exists
 ERROR 1050 (42S01) at line 482: Table 'SETUP_OBJECTS' already exists
 ERROR 1050 (42S01) at line 498: Table 'SETUP_TIMERS' already exists
-ERROR 1644 (HY000) at line 1140: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 1138: 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 445: Table 'S
 ERROR 1050 (42S01) at line 462: Table 'SETUP_INSTRUMENTS' already exists
 ERROR 1050 (42S01) at line 482: Table 'SETUP_OBJECTS' already exists
 ERROR 1050 (42S01) at line 498: Table 'SETUP_TIMERS' already exists
-ERROR 1644 (HY000) at line 1140: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 1138: 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 445: Table 'S
 ERROR 1050 (42S01) at line 462: Table 'SETUP_INSTRUMENTS' already exists
 ERROR 1050 (42S01) at line 482: Table 'SETUP_OBJECTS' already exists
 ERROR 1050 (42S01) at line 498: Table 'SETUP_TIMERS' already exists
-ERROR 1644 (HY000) at line 1140: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 1138: 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/davi.arnaut@sun.com-20100715215747-jeokad3ce1i0v5pl.bundle
Thread
bzr push into mysql-trunk-merge branch (davi:3125 to 3126) Bug#53613Davi Arnaut15 Jul