List:Commits« Previous MessageNext Message »
From:Alfranio Correia Date:November 19 2010 11:24am
Subject:bzr commit into mysql-trunk branch (alfranio.correia:3207) WL#2775
View as plain text  
#At file:///home/acorreia/workspace.sun/repository.mysql.new/bzrwork/wl-2775/mysql-trunk-stage/ based on revid:alfranio.correia@stripped

 3207 Alfranio Correia	2010-11-19
      Post-merge fix for WL#2775.

    modified:
      mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result
      sql/CMakeLists.txt
=== modified file 'mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result'
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result	2010-11-09 08:16:50 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result	2010-11-19 11:24:33 +0000
@@ -8,25 +8,25 @@ use performance_schema;
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
 user_table
-ERROR 1050 (42S01) at line 68: Table 'cond_instances' already exists
-ERROR 1050 (42S01) at line 90: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 112: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 134: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 147: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 160: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 172: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 181: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 192: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 204: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 213: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 223: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 233: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 287: Table 'threads' already exists
-ERROR 1644 (HY000) at line 705: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 70: Table 'cond_instances' already exists
+ERROR 1050 (42S01) at line 92: Table 'events_waits_current' already exists
+ERROR 1050 (42S01) at line 114: Table 'events_waits_history' already exists
+ERROR 1050 (42S01) at line 136: Table 'events_waits_history_long' already exists
+ERROR 1050 (42S01) at line 149: Table 'events_waits_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 162: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 174: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 183: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 194: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 206: Table 'file_summary_by_instance' already exists
+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 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)
@@ -39,25 +39,25 @@ use performance_schema;
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
 user_view
-ERROR 1050 (42S01) at line 68: Table 'cond_instances' already exists
-ERROR 1050 (42S01) at line 90: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 112: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 134: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 147: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 160: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 172: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 181: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 192: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 204: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 213: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 223: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 233: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 287: Table 'threads' already exists
-ERROR 1644 (HY000) at line 705: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 70: Table 'cond_instances' already exists
+ERROR 1050 (42S01) at line 92: Table 'events_waits_current' already exists
+ERROR 1050 (42S01) at line 114: Table 'events_waits_history' already exists
+ERROR 1050 (42S01) at line 136: Table 'events_waits_history_long' already exists
+ERROR 1050 (42S01) at line 149: Table 'events_waits_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 162: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 174: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 183: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 194: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 206: Table 'file_summary_by_instance' already exists
+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 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)
@@ -68,25 +68,25 @@ 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 68: Table 'cond_instances' already exists
-ERROR 1050 (42S01) at line 90: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 112: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 134: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 147: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 160: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 172: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 181: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 192: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 204: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 213: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 223: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 233: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 287: Table 'threads' already exists
-ERROR 1644 (HY000) at line 705: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 70: Table 'cond_instances' already exists
+ERROR 1050 (42S01) at line 92: Table 'events_waits_current' already exists
+ERROR 1050 (42S01) at line 114: Table 'events_waits_history' already exists
+ERROR 1050 (42S01) at line 136: Table 'events_waits_history_long' already exists
+ERROR 1050 (42S01) at line 149: Table 'events_waits_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 162: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 174: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 183: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 194: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 206: Table 'file_summary_by_instance' already exists
+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 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
@@ -97,25 +97,25 @@ 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 68: Table 'cond_instances' already exists
-ERROR 1050 (42S01) at line 90: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 112: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 134: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 147: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 160: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 172: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 181: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 192: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 204: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 213: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 223: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 233: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 287: Table 'threads' already exists
-ERROR 1644 (HY000) at line 705: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 70: Table 'cond_instances' already exists
+ERROR 1050 (42S01) at line 92: Table 'events_waits_current' already exists
+ERROR 1050 (42S01) at line 114: Table 'events_waits_history' already exists
+ERROR 1050 (42S01) at line 136: Table 'events_waits_history_long' already exists
+ERROR 1050 (42S01) at line 149: Table 'events_waits_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 162: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 174: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 183: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 194: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 206: Table 'file_summary_by_instance' already exists
+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 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
@@ -126,25 +126,25 @@ 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 68: Table 'cond_instances' already exists
-ERROR 1050 (42S01) at line 90: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 112: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 134: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 147: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 160: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 172: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 181: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 192: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 204: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 213: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 223: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 233: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 287: Table 'threads' already exists
-ERROR 1644 (HY000) at line 705: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 70: Table 'cond_instances' already exists
+ERROR 1050 (42S01) at line 92: Table 'events_waits_current' already exists
+ERROR 1050 (42S01) at line 114: Table 'events_waits_history' already exists
+ERROR 1050 (42S01) at line 136: Table 'events_waits_history_long' already exists
+ERROR 1050 (42S01) at line 149: Table 'events_waits_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 162: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 174: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 183: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 194: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 206: Table 'file_summary_by_instance' already exists
+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 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

=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt	2010-11-15 16:43:41 +0000
+++ b/sql/CMakeLists.txt	2010-11-19 11:24:33 +0000
@@ -95,7 +95,7 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
 
 SET (BINLOG_SOURCE log_event.cc log_event_old.cc binlog.cc sql_binlog.cc
 		   rpl_filter.cc rpl_record.cc rpl_record_old.cc rpl_utility.cc
-		   sql_binlog.cc rpl_injector.cc)
+		   rpl_injector.cc)
 ADD_LIBRARY(binlog ${BINLOG_SOURCE})
 SET (RPL_SOURCE rpl_handler.cc rpl_tblmap.cc)
 ADD_DEPENDENCIES(binlog GenError)


Attachment: [text/bzr-bundle] bzr/alfranio.correia@oracle.com-20101119112433-ybwk3pg30nr71vt3.bundle
Thread
bzr commit into mysql-trunk branch (alfranio.correia:3207) WL#2775Alfranio Correia19 Nov