List:Commits« Previous MessageNext Message »
From:Alfranio Correia Date:September 9 2010 11:13am
Subject:bzr commit into mysql-next-mr-rpl-merge branch (alfranio.correia:3024)
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

 3024 Alfranio Correia	2010-09-09
      Post-merge fix.

    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-09-06 11:10:01 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result	2010-09-09 11:13:28 +0000
@@ -8,24 +8,24 @@ use performance_schema;
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
 user_table
-ERROR 1050 (42S01) at line 67: Table 'cond_instances' already exists
-ERROR 1050 (42S01) at line 89: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 111: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 133: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 146: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 159: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 171: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 180: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 191: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 203: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 240: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 266: Table 'threads' already exists
-ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 69: Table 'cond_instances' already exists
+ERROR 1050 (42S01) at line 91: Table 'events_waits_current' already exists
+ERROR 1050 (42S01) at line 113: Table 'events_waits_history' already exists
+ERROR 1050 (42S01) at line 135: Table 'events_waits_history_long' already exists
+ERROR 1050 (42S01) at line 148: Table 'events_waits_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 161: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 173: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 182: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 193: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 205: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 214: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 224: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 234: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 242: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 251: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 259: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 268: Table 'threads' already exists
+ERROR 1644 (HY000) at line 684: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
@@ -38,24 +38,24 @@ use performance_schema;
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
 user_view
-ERROR 1050 (42S01) at line 67: Table 'cond_instances' already exists
-ERROR 1050 (42S01) at line 89: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 111: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 133: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 146: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 159: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 171: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 180: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 191: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 203: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 240: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 266: Table 'threads' already exists
-ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 69: Table 'cond_instances' already exists
+ERROR 1050 (42S01) at line 91: Table 'events_waits_current' already exists
+ERROR 1050 (42S01) at line 113: Table 'events_waits_history' already exists
+ERROR 1050 (42S01) at line 135: Table 'events_waits_history_long' already exists
+ERROR 1050 (42S01) at line 148: Table 'events_waits_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 161: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 173: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 182: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 193: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 205: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 214: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 224: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 234: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 242: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 251: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 259: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 268: Table 'threads' already exists
+ERROR 1644 (HY000) at line 684: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
@@ -66,24 +66,24 @@ drop view test.user_view;
 create procedure test.user_proc()
 select "Not supposed to be here";
 update mysql.proc set db='performance_schema' where name='user_proc';
-ERROR 1050 (42S01) at line 67: Table 'cond_instances' already exists
-ERROR 1050 (42S01) at line 89: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 111: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 133: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 146: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 159: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 171: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 180: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 191: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 203: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 240: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 266: Table 'threads' already exists
-ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 69: Table 'cond_instances' already exists
+ERROR 1050 (42S01) at line 91: Table 'events_waits_current' already exists
+ERROR 1050 (42S01) at line 113: Table 'events_waits_history' already exists
+ERROR 1050 (42S01) at line 135: Table 'events_waits_history_long' already exists
+ERROR 1050 (42S01) at line 148: Table 'events_waits_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 161: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 173: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 182: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 193: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 205: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 214: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 224: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 234: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 242: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 251: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 259: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 268: Table 'threads' already exists
+ERROR 1644 (HY000) at line 684: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -94,24 +94,24 @@ drop procedure test.user_proc;
 create function test.user_func() returns integer
 return 0;
 update mysql.proc set db='performance_schema' where name='user_func';
-ERROR 1050 (42S01) at line 67: Table 'cond_instances' already exists
-ERROR 1050 (42S01) at line 89: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 111: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 133: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 146: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 159: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 171: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 180: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 191: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 203: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 240: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 266: Table 'threads' already exists
-ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 69: Table 'cond_instances' already exists
+ERROR 1050 (42S01) at line 91: Table 'events_waits_current' already exists
+ERROR 1050 (42S01) at line 113: Table 'events_waits_history' already exists
+ERROR 1050 (42S01) at line 135: Table 'events_waits_history_long' already exists
+ERROR 1050 (42S01) at line 148: Table 'events_waits_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 161: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 173: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 182: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 193: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 205: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 214: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 224: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 234: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 242: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 251: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 259: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 268: Table 'threads' already exists
+ERROR 1644 (HY000) at line 684: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -122,24 +122,24 @@ drop function test.user_func;
 create event test.user_event on schedule every 1 day do
 select "not supposed to be here";
 update mysql.event set db='performance_schema' where name='user_event';
-ERROR 1050 (42S01) at line 67: Table 'cond_instances' already exists
-ERROR 1050 (42S01) at line 89: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 111: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 133: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 146: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 159: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 171: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 180: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 191: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 203: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 240: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 266: Table 'threads' already exists
-ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 69: Table 'cond_instances' already exists
+ERROR 1050 (42S01) at line 91: Table 'events_waits_current' already exists
+ERROR 1050 (42S01) at line 113: Table 'events_waits_history' already exists
+ERROR 1050 (42S01) at line 135: Table 'events_waits_history_long' already exists
+ERROR 1050 (42S01) at line 148: Table 'events_waits_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 161: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 173: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 182: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 193: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 205: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 214: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 224: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 234: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 242: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 251: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 259: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 268: Table 'threads' already exists
+ERROR 1644 (HY000) at line 684: 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-20100909111328-v41ylbu3its3ee1i.bundle
Thread
bzr commit into mysql-next-mr-rpl-merge branch (alfranio.correia:3024) Alfranio Correia9 Sep