List:Commits« Previous MessageNext Message »
From:Tor Didriksen Date:November 5 2010 3:09pm
Subject:bzr push into mysql-next-mr branch (tor.didriksen:3365 to 3366) WL#5185
View as plain text  
 3366 Tor Didriksen	2010-11-05
      WL#5185 post-push fix

    modified:
      mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result
 3365 Ramil Kalimullin	2010-11-05 [merge]
      Auto-merge from mysql-trunk-bugfixing.

    modified:
      mysql-test/r/keywords.result
      mysql-test/t/keywords.test
      sql/sql_yacc.yy
=== modified file 'mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result'
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result	2010-10-26 06:16:50 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result	2010-11-05 14:01:29 +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 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 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 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 243: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 251: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 260: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 268: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 288: Table 'threads' already exists
+ERROR 1644 (HY000) at line 706: 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 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 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 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 243: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 251: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 260: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 268: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 288: Table 'threads' already exists
+ERROR 1644 (HY000) at line 706: 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 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 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 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 243: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 251: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 260: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 268: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 288: Table 'threads' already exists
+ERROR 1644 (HY000) at line 706: 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 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 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 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 243: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 251: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 260: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 268: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 288: Table 'threads' already exists
+ERROR 1644 (HY000) at line 706: 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 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 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 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 243: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 251: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 260: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 268: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 288: Table 'threads' already exists
+ERROR 1644 (HY000) at line 706: 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-next-mr branch (tor.didriksen:3365 to 3366) WL#5185Tor Didriksen5 Nov