List:Commits« Previous MessageNext Message »
From:Alfranio Correia Date:September 14 2010 8:47am
Subject:bzr push into mysql-next-mr-rpl-merge branch (alfranio.correia:3030 to 3032)
View as plain text  
 3032 Alfranio Correia	2010-09-14
      Added collections to periodically run the crash-safe slave.

    added:
      mysql-test/collections/mysql-next-mr.crash-safe.daily
      mysql-test/collections/mysql-next-mr.crash-safe.push
      mysql-test/collections/mysql-next-mr.crash-safe.weekly
 3031 Alfranio Correia	2010-09-14
      Post-merge fix.

    modified:
      mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result
 3030 Alfranio Correia	2010-09-14 [merge]
      merge mysql-next-mr-rpl-merge --> mysql-next-mr.crash-safe

    removed:
      mysql-test/suite/perfschema/r/ddl_threads.result
      mysql-test/suite/perfschema/r/dml_threads.result
      mysql-test/suite/perfschema/t/ddl_threads.test
      mysql-test/suite/perfschema/t/dml_threads.test
      mysql-test/suite/perfschema/t/schema.test
      storage/perfschema/table_threads.cc
      storage/perfschema/table_threads.h
    added:
      mysql-test/suite/perfschema/include/schema.inc
      mysql-test/suite/perfschema/r/ddl_setup_actors.result
      mysql-test/suite/perfschema/r/ddl_threads.result
      mysql-test/suite/perfschema/r/dml_setup_actors.result
      mysql-test/suite/perfschema/r/dml_threads.result
      mysql-test/suite/perfschema/r/schema_lc0.result
      mysql-test/suite/perfschema/r/schema_lc1.result
      mysql-test/suite/perfschema/r/schema_lc2.result
      mysql-test/suite/perfschema/r/setup_actors.result
      mysql-test/suite/perfschema/r/start_server_no_setup_actors.result
      mysql-test/suite/perfschema/r/threads_events.result
      mysql-test/suite/perfschema/r/threads_innodb.result
      mysql-test/suite/perfschema/r/threads_insert_delayed.result
      mysql-test/suite/perfschema/r/threads_mysql.result
      mysql-test/suite/perfschema/t/ddl_setup_actors.test
      mysql-test/suite/perfschema/t/ddl_threads.test
      mysql-test/suite/perfschema/t/dml_setup_actors.test
      mysql-test/suite/perfschema/t/dml_threads.test
      mysql-test/suite/perfschema/t/schema_lc0.test
      mysql-test/suite/perfschema/t/schema_lc1.test
      mysql-test/suite/perfschema/t/schema_lc2.test
      mysql-test/suite/perfschema/t/setup_actors.test
      mysql-test/suite/perfschema/t/start_server_no_setup_actors-master.opt
      mysql-test/suite/perfschema/t/start_server_no_setup_actors.test
      mysql-test/suite/perfschema/t/threads_innodb.test
      mysql-test/suite/perfschema/t/threads_insert_delayed.test
      mysql-test/suite/perfschema/t/threads_mysql-master.opt
      mysql-test/suite/perfschema/t/threads_mysql.test
      mysql-test/suite/sys_vars/r/pfs_setup_actors_size_basic.result
      mysql-test/suite/sys_vars/t/pfs_setup_actors_size_basic-master.opt
      mysql-test/suite/sys_vars/t/pfs_setup_actors_size_basic.test
      storage/perfschema/pfs_defaults.cc
      storage/perfschema/pfs_defaults.h
      storage/perfschema/pfs_setup_actor.cc
      storage/perfschema/pfs_setup_actor.h
      storage/perfschema/table_setup_actors.cc
      storage/perfschema/table_setup_actors.h
      storage/perfschema/table_threads.cc
      storage/perfschema/table_threads.h
    modified:
      client/CMakeLists.txt
      include/CMakeLists.txt
      include/Makefile.am
      include/mysql/psi/psi.h
      include/mysql/psi/psi_abi_v1.h.pp
      libmysqld/lib_sql.cc
      mysql-test/r/information_schema.result
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/r/sp-destruct.result
      mysql-test/suite/perfschema/include/setup_helper.inc
      mysql-test/suite/perfschema/include/start_server_common.inc
      mysql-test/suite/perfschema/r/func_file_io.result
      mysql-test/suite/perfschema/r/information_schema.result
      mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result
      mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result
      mysql-test/suite/perfschema/r/selects.result
      mysql-test/suite/perfschema/r/start_server_no_cond_class.result
      mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
      mysql-test/suite/perfschema/r/start_server_no_file_class.result
      mysql-test/suite/perfschema/r/start_server_no_file_inst.result
      mysql-test/suite/perfschema/r/start_server_no_mutex_class.result
      mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result
      mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result
      mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result
      mysql-test/suite/perfschema/r/start_server_no_table_hdl.result
      mysql-test/suite/perfschema/r/start_server_no_table_inst.result
      mysql-test/suite/perfschema/r/start_server_no_thread_class.result
      mysql-test/suite/perfschema/r/start_server_no_thread_inst.result
      mysql-test/suite/perfschema/r/start_server_nothing.result
      mysql-test/suite/perfschema/r/start_server_off.result
      mysql-test/suite/perfschema/r/start_server_on.result
      mysql-test/suite/perfschema/t/disabled.def
      mysql-test/suite/perfschema/t/func_file_io.test
      mysql-test/suite/perfschema/t/selects.test
      mysql-test/suite/perfschema/t/start_server_nothing.test
      mysql-test/suite/perfschema/t/thread_cache.test
      mysql-test/t/information_schema.test
      mysql-test/t/sp-destruct.test
      scripts/CMakeLists.txt
      scripts/make_win_bin_dist
      scripts/mysql_system_tables.sql
      sql/CMakeLists.txt
      sql/event_scheduler.cc
      sql/ha_ndbcluster_binlog.cc
      sql/log.cc
      sql/mdl.cc
      sql/mdl.h
      sql/rpl_master.cc
      sql/sp.cc
      sql/sql_base.cc
      sql/sql_base.h
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_connect.cc
      sql/sql_insert.cc
      sql/sql_parse.cc
      sql/sql_prepare.cc
      sql/sql_show.cc
      sql/sql_table.cc
      sql/sys_vars.cc
      sql/table.cc
      storage/perfschema/CMakeLists.txt
      storage/perfschema/Makefile.am
      storage/perfschema/ha_perfschema.cc
      storage/perfschema/ha_perfschema.h
      storage/perfschema/pfs.cc
      storage/perfschema/pfs_engine_table.cc
      storage/perfschema/pfs_engine_table.h
      storage/perfschema/pfs_instr.cc
      storage/perfschema/pfs_instr.h
      storage/perfschema/pfs_lock.h
      storage/perfschema/pfs_server.cc
      storage/perfschema/pfs_server.h
      storage/perfschema/table_events_waits.cc
      storage/perfschema/table_events_waits.h
      storage/perfschema/table_events_waits_summary.cc
      storage/perfschema/table_events_waits_summary.h
      storage/perfschema/table_ews_global_by_event_name.cc
      storage/perfschema/table_file_instances.cc
      storage/perfschema/table_file_instances.h
      storage/perfschema/table_file_summary.cc
      storage/perfschema/table_file_summary.h
      storage/perfschema/table_performance_timers.cc
      storage/perfschema/table_setup_consumers.cc
      storage/perfschema/table_setup_instruments.cc
      storage/perfschema/table_setup_timers.cc
      storage/perfschema/table_sync_instances.cc
      storage/perfschema/table_sync_instances.h
      storage/perfschema/unittest/pfs-t.cc
      storage/perfschema/unittest/pfs_instr-oom-t.cc
      storage/perfschema/unittest/pfs_instr-t.cc
      storage/perfschema/unittest/stub_pfs_global.h
=== added file 'mysql-test/collections/mysql-next-mr.crash-safe.daily'
--- a/mysql-test/collections/mysql-next-mr.crash-safe.daily	1970-01-01 00:00:00 +0000
+++ b/mysql-test/collections/mysql-next-mr.crash-safe.daily	2010-09-14 08:47:23 +0000
@@ -0,0 +1,24 @@
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=n_mix          --vardir=var-n_mix                  --mysqld=--binlog-format=mixed
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=ps_row         --vardir=var-ps_row   --ps-protocol --mysqld=--binlog-format=row
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=embedded       --vardir=var-emebbed  --embedded
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=funcs_1        --vardir=var-funcs_1                                              --suite=funcs_1
+perl mysql-test-run.pl --timer --force --parallel=auto                                                 --comment=rpl_ndb_row    --vardir=var-rpl_ndb_row            --mysqld=--binlog-format=row  --suite=rpl_ndb,ndb
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog_row --vardir=var-rpl_binlog_row --mysqld=--binlog-format=row --suite=rpl,binlog --skip-ndb
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=n_mix_relay          --vardir=var-n_mix_relay                  --mysqld=--binlog-format=mixed --mysqld=--relay-log-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=ps_row_relay         --vardir=var-ps_row_relay   --ps-protocol --mysqld=--binlog-format=row --mysqld=--relay-log-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=embedded_relay       --vardir=var-emebbed_relay  --embedded --mysqld=--relay-log-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=funcs_1_relay        --vardir=var-funcs_1_relay                                              --suite=funcs_1 --mysqld=--relay-log-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --parallel=auto                                                 --comment=rpl_ndb_row_relay    --vardir=var-rpl_ndb_row_relay            --mysqld=--binlog-format=row  --suite=rpl_ndb,ndb --mysqld=--relay-log-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog_row_relay --vardir=var-rpl_binlog_row_relay --mysqld=--binlog-format=row --suite=rpl,binlog --skip-ndb --mysqld=--relay-log-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=n_mix_master          --vardir=var-n_mix_master                  --mysqld=--binlog-format=mixed --mysqld=--master-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=ps_row_master         --vardir=var-ps_row_master   --ps-protocol --mysqld=--binlog-format=row --mysqld=--master-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=embedded_master       --vardir=var-emebbed_master  --embedded --mysqld=--master-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=funcs_1_master        --vardir=var-funcs_1_master                                              --suite=funcs_1 --mysqld=--master-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --parallel=auto                                                 --comment=rpl_ndb_row_master    --vardir=var-rpl_ndb_row_master            --mysqld=--binlog-format=row  --suite=rpl_ndb,ndb --mysqld=--master-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog_row_master --vardir=var-rpl_binlog_row_master --mysqld=--binlog-format=row --suite=rpl,binlog --skip-ndb --mysqld=--master-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=n_mix_both          --vardir=var-n_mix_both                  --mysqld=--binlog-format=mixed --mysqld=--master-info-repository=TABLE --mysqld=--relay-log-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=ps_row_both         --vardir=var-ps_row_both   --ps-protocol --mysqld=--binlog-format=row --mysqld=--master-info-repository=TABLE --mysqld=--relay-log-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=embedded_both       --vardir=var-emebbed_both  --embedded --mysqld=--master-info-repository=TABLE --mysqld=--relay-log-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=funcs_1_both        --vardir=var-funcs_1_both                                              --suite=funcs_1 --mysqld=--master-info-repository=TABLE --mysqld=--relay-log-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --parallel=auto                                                 --comment=rpl_ndb_row_both    --vardir=var-rpl_ndb_row_both            --mysqld=--binlog-format=row  --suite=rpl_ndb,ndb --mysqld=--master-info-repository=TABLE --mysqld=--relay-log-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog_row_both --vardir=var-rpl_binlog_row_both --mysqld=--binlog-format=row --suite=rpl,binlog --skip-ndb --mysqld=--master-info-repository=TABLE --mysqld=--relay-log-info-repository=TABLE

=== added file 'mysql-test/collections/mysql-next-mr.crash-safe.push'
--- a/mysql-test/collections/mysql-next-mr.crash-safe.push	1970-01-01 00:00:00 +0000
+++ b/mysql-test/collections/mysql-next-mr.crash-safe.push	2010-09-14 08:47:23 +0000
@@ -0,0 +1,20 @@
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=ps_row --vardir=var-ps_row --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=embedded --vardir=var-emebbed  --embedded --experimental=collections/default.experimental --skip-ndb
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_binlog_row --vardir=var-rpl_binlog_row  --suite=rpl,binlog --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=funcs_1 --vardir=var-funcs_1 --suite=funcs_1 --experimental=collections/default.experimental --skip-ndb
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix_relay --vardir=var-n_mix_relay --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--relay-log-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=ps_row_relay --vardir=var-ps_row_relay --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--relay-log-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=embedded_relay --vardir=var-emebbed_relay  --embedded --experimental=collections/default.experimental --skip-ndb --mysqld=--master-info-repository=TABLE --mysqld=--relay-log-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_binlog_row_relay --vardir=var-rpl_binlog_row_relay  --suite=rpl,binlog --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--relay-log-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=funcs_1_relay --vardir=var-funcs_1_relay --suite=funcs_1 --experimental=collections/default.experimental --skip-ndb --mysqld=--relay-log-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix_master --vardir=var-n_mix_master --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--master-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=ps_row_master --vardir=var-ps_row_master --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--master-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=embedded_master --vardir=var-emebbed_master  --embedded --experimental=collections/default.experimental --skip-ndb --mysqld=--master-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_binlog_row_master --vardir=var-rpl_binlog_row_master  --suite=rpl,binlog --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--master-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=funcs_1_master --vardir=var-funcs_1_master --suite=funcs_1 --experimental=collections/default.experimental --skip-ndb --mysqld=--master-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix_both --vardir=var-n_mix_both --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--master-info-repository=TABLE --mysqld=--relay-log-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=ps_row_both --vardir=var-ps_row_both --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--master-info-repository=TABLE --mysqld=--relay-log-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=embedded_both --vardir=var-emebbed_both --embedded  --experimental=collections/default.experimental --skip-ndb --mysqld=--master-info-repository=TABLE --mysqld=--relay-log-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_binlog_row_both --vardir=var-rpl_binlog_row_both  --suite=rpl,binlog --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--master-info-repository=TABLE --mysqld=--relay-log-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=funcs_1_both --vardir=var-funcs_1_both --suite=funcs_1 --experimental=collections/default.experimental --skip-ndb --mysqld=--master-info-repository=TABLE --mysqld=--relay-log-info-repository=TABLE

=== added file 'mysql-test/collections/mysql-next-mr.crash-safe.weekly'
--- a/mysql-test/collections/mysql-next-mr.crash-safe.weekly	1970-01-01 00:00:00 +0000
+++ b/mysql-test/collections/mysql-next-mr.crash-safe.weekly	2010-09-14 08:47:23 +0000
@@ -0,0 +1,4 @@
+perl mysql-test-run.pl --timer --force --comment=1st --experimental=collections/default.experimental 1st
+perl mysql-test-run.pl --timer --force --comment=1st_relay --experimental=collections/default.experimental 1st --mysqld=--relay-log-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --comment=1st_master --experimental=collections/default.experimental 1st --mysqld=--master-info-repository=TABLE
+perl mysql-test-run.pl --timer --force --comment=1st_both --experimental=collections/default.experimental 1st --mysqld=--master-info-repository=TABLE --mysqld=--relay-log-info-repository=TABLE

=== modified file 'mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result'
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result	2010-09-13 23:57:59 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result	2010-09-14 08:38:28 +0000
@@ -21,11 +21,12 @@ ERROR 1050 (42S01) at line 205: Table 'f
 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.
+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 705: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
@@ -51,11 +52,12 @@ ERROR 1050 (42S01) at line 205: Table 'f
 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.
+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 705: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
@@ -79,11 +81,12 @@ ERROR 1050 (42S01) at line 205: Table 'f
 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.
+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 705: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -107,11 +110,12 @@ ERROR 1050 (42S01) at line 205: Table 'f
 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.
+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 705: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -135,11 +139,12 @@ ERROR 1050 (42S01) at line 205: Table 'f
 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.
+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 705: 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-20100914084723-p10op7om2brnx00g.bundle
Thread
bzr push into mysql-next-mr-rpl-merge branch (alfranio.correia:3030 to 3032)Alfranio Correia14 Sep