List:Commits« Previous MessageNext Message »
From:Alfranio Correia Date:November 16 2010 8:20pm
Subject:bzr commit into mysql-next-mr.crash-safe branch (alfranio.correia:3063)
WL#2775
View as plain text  
#At file:///home/acorreia/workspace.sun/repository.mysql.new/bzrwork/wl-2775/mysql-next-mr-rpl-merge.crash-safe.2775/ based on revid:alfranio.correia@stripped

 3063 Alfranio Correia	2010-11-16
      Post-merge fix for WL#2775.

    modified:
      mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result
=== modified file 'mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result'
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result	2010-11-16 12:48:25 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result	2010-11-16 20:19:48 +0000
@@ -21,12 +21,12 @@ ERROR 1050 (42S01) at line 206: Table 'f
 ERROR 1050 (42S01) at line 215: Table 'mutex_instances' already exists
 ERROR 1050 (42S01) at line 225: Table 'performance_timers' already exists
 ERROR 1050 (42S01) at line 235: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 245: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 253: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 262: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 270: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 290: Table 'threads' already exists
-ERROR 1644 (HY000) at line 706: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 244: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 252: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 261: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 269: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 289: Table 'threads' already exists
+ERROR 1644 (HY000) at line 707: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
@@ -52,12 +52,12 @@ ERROR 1050 (42S01) at line 206: Table 'f
 ERROR 1050 (42S01) at line 215: Table 'mutex_instances' already exists
 ERROR 1050 (42S01) at line 225: Table 'performance_timers' already exists
 ERROR 1050 (42S01) at line 235: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 245: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 253: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 262: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 270: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 290: Table 'threads' already exists
-ERROR 1644 (HY000) at line 706: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 244: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 252: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 261: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 269: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 289: Table 'threads' already exists
+ERROR 1644 (HY000) at line 707: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
@@ -81,12 +81,12 @@ ERROR 1050 (42S01) at line 206: Table 'f
 ERROR 1050 (42S01) at line 215: Table 'mutex_instances' already exists
 ERROR 1050 (42S01) at line 225: Table 'performance_timers' already exists
 ERROR 1050 (42S01) at line 235: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 245: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 253: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 262: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 270: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 290: Table 'threads' already exists
-ERROR 1644 (HY000) at line 706: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 244: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 252: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 261: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 269: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 289: Table 'threads' already exists
+ERROR 1644 (HY000) at line 707: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -110,12 +110,12 @@ ERROR 1050 (42S01) at line 206: Table 'f
 ERROR 1050 (42S01) at line 215: Table 'mutex_instances' already exists
 ERROR 1050 (42S01) at line 225: Table 'performance_timers' already exists
 ERROR 1050 (42S01) at line 235: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 245: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 253: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 262: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 270: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 290: Table 'threads' already exists
-ERROR 1644 (HY000) at line 706: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 244: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 252: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 261: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 269: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 289: Table 'threads' already exists
+ERROR 1644 (HY000) at line 707: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -139,12 +139,12 @@ ERROR 1050 (42S01) at line 206: Table 'f
 ERROR 1050 (42S01) at line 215: Table 'mutex_instances' already exists
 ERROR 1050 (42S01) at line 225: Table 'performance_timers' already exists
 ERROR 1050 (42S01) at line 235: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 245: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 253: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 262: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 270: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 290: Table 'threads' already exists
-ERROR 1644 (HY000) at line 706: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 244: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 252: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 261: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 269: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 289: Table 'threads' already exists
+ERROR 1644 (HY000) at line 707: 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/alfranio.correia@oracle.com-20101116201948-dykpo90eilpxwvan.bundle
Thread
bzr commit into mysql-next-mr.crash-safe branch (alfranio.correia:3063)WL#2775Alfranio Correia16 Nov