List:Commits« Previous MessageNext Message »
From:magnus.blaudd Date:November 2 2012 6:09am
Subject:bzr push into mysql-trunk-cluster branch (magnus.blaudd:3550 to 3551)
View as plain text  
 3551 magnus.blaudd@stripped	2012-11-01 [merge]
      Merge 5.6-cluster-7.3 -> trunk-cluster

    removed:
      mysql-test/include/have_batch_key_access.inc
      mysql-test/include/have_binlog_row_v2.inc
      mysql-test/r/have_binlog_row_v2.require
      mysql-test/suite/innodb/r/innodb_bug12661768.result.moved
      mysql-test/suite/innodb/r/innodb_cmp_drop_table.result.moved
      mysql-test/suite/innodb/t/innodb_bug12661768.test.moved
      mysql-test/suite/innodb/t/innodb_cmp_drop_table-master.opt.moved
      mysql-test/suite/innodb/t/innodb_cmp_drop_table.test.moved
      mysql-test/suite/perfschema/r/pfs_upgrade.result.THIS
    modified:
      mysql-test/CMakeLists.txt
      mysql-test/r/key_cache.result
      mysql-test/suite/innodb/t/innodb_corrupt_bit.test
      mysql-test/suite/ndb/t/disabled.def
      mysql-test/suite/ndb/t/ndb_join_pushdown_bka.test
      mysql-test/suite/ndb_memcache/t/disabled.def
      mysql-test/suite/rpl_ndb/t/disabled.def
      mysql-test/t/key_cache.test
 3550 magnus.blaudd@stripped	2012-11-01
      Merge in fix for ndbinfo_cache

    modified:
      mysql-test/suite/ndb/r/ndbinfo_cache.result
      mysql-test/suite/ndb/t/ndbinfo_cache.test
=== modified file 'mysql-test/CMakeLists.txt'
--- a/mysql-test/CMakeLists.txt	2012-05-02 19:09:22 +0000
+++ b/mysql-test/CMakeLists.txt	2012-11-01 18:51:34 +0000
@@ -14,7 +14,6 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 
-# MCP_BUG13511612 CHANGE PATTERN var/ to PATTERN var/* 
 IF(INSTALL_MYSQLTESTDIR)
 INSTALL(
   DIRECTORY .

=== removed file 'mysql-test/include/have_batch_key_access.inc'
--- a/mysql-test/include/have_batch_key_access.inc	2011-11-16 14:47:33 +0000
+++ b/mysql-test/include/have_batch_key_access.inc	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
--- require r/have_optimizer_switch.require
---disable_query_log
-select locate('batch_key_access', @@optimizer_switch) > 0 AS OPTIMIZER_SWITCH;
---enable_query_log

=== removed file 'mysql-test/include/have_binlog_row_v2.inc'
--- a/mysql-test/include/have_binlog_row_v2.inc	2011-09-21 10:57:59 +0000
+++ b/mysql-test/include/have_binlog_row_v2.inc	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-# Purpose
-# Ensure server has v2 Binlog row events
-#
-
---require r/have_binlog_row_v2.require
-disable_query_log;
-show variables like 'log_bin_use_v1_row_events';
-enable_query_log;
\ No newline at end of file

=== removed file 'mysql-test/r/have_binlog_row_v2.require'
--- a/mysql-test/r/have_binlog_row_v2.require	2011-09-21 10:57:59 +0000
+++ b/mysql-test/r/have_binlog_row_v2.require	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-Variable_name	Value
-log_bin_use_v1_row_events	OFF

=== modified file 'mysql-test/r/key_cache.result'
--- a/mysql-test/r/key_cache.result	2012-02-23 12:37:59 +0000
+++ b/mysql-test/r/key_cache.result	2012-11-01 18:59:17 +0000
@@ -383,3 +383,19 @@ Variable_name	Value
 key_cache_block_size	1536
 SET GLOBAL key_cache_block_size= @bug28478_key_cache_block_size;
 DROP TABLE t1;
+#
+# Bug#12361113: crash when load index into cache
+#
+# Note that this creates an empty disabled key cache!
+SET GLOBAL key_cache_none.key_cache_block_size = 1024;
+CREATE TABLE t1 (a INT, b INTEGER NOT NULL, KEY (b) ) ENGINE = MYISAM;
+INSERT INTO t1 VALUES (1, 1);
+CACHE INDEX t1 in key_cache_none;
+ERROR HY000: Unknown key cache 'key_cache_none'
+# The bug crashed the server at LOAD INDEX below. Now it will succeed 
+# since the default cache is used due to CACHE INDEX failed for
+# key_cache_none.
+LOAD INDEX INTO CACHE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	preload_keys	status	OK
+DROP TABLE t1;

=== removed file 'mysql-test/suite/innodb/r/innodb_bug12661768.result.moved'
--- a/mysql-test/suite/innodb/r/innodb_bug12661768.result.moved	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/innodb/r/innodb_bug12661768.result.moved	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-SET SESSION foreign_key_checks=0;
-ERROR 23000: Upholding foreign key constraints for table 'bug12661768_1', entry '3-bbb', key 2 would lead to a duplicate entry

=== removed file 'mysql-test/suite/innodb/r/innodb_cmp_drop_table.result.moved'
--- a/mysql-test/suite/innodb/r/innodb_cmp_drop_table.result.moved	2012-02-23 12:37:59 +0000
+++ b/mysql-test/suite/innodb/r/innodb_cmp_drop_table.result.moved	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-set global innodb_file_per_table=on;
-set global innodb_file_format=`1`;
-create table t1(a text) engine=innodb key_block_size=8;
-SELECT page_size FROM information_schema.innodb_cmpmem WHERE pages_used > 0;
-page_size
-8192
-drop table t1;
-SELECT page_size FROM information_schema.innodb_cmpmem WHERE pages_used > 0;
-page_size
-create table t2(a text) engine=innodb;
-SELECT page_size FROM information_schema.innodb_cmpmem WHERE pages_used > 0;
-page_size
-drop table t2;

=== removed file 'mysql-test/suite/innodb/t/innodb_bug12661768.test.moved'
--- a/mysql-test/suite/innodb/t/innodb_bug12661768.test.moved	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/innodb/t/innodb_bug12661768.test.moved	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-#
-# Bug#12661768 UPDATE IGNORE CRASHES SERVER IF TABLE IS INNODB AND IT IS
-# PARENT FOR OTHER ONE
-#
-
--- source include/have_innodb.inc
-
-SET SESSION foreign_key_checks=0;
-
-# only interested that the "UPDATE IGNORE" at the end does not crash the server
-
--- disable_query_log
--- disable_result_log
-
-SET NAMES utf8;
-
--- let $t1_name = bug12661768_1
--- let $t2_name = bug12661768_2
--- let $fk_name = ab_on_2
--- let $key_str = 'bbb'
-
-eval DROP TABLE IF EXISTS `$t2_name`, `$t1_name`;
-
-eval CREATE TABLE `$t1_name` (
-	a INT,
-	b VARCHAR(512),
-	PRIMARY KEY (a, b)
-) ENGINE=INNODB;
-
-eval CREATE TABLE `$t2_name` (
-	id INT,
-	a INT,
-	b VARCHAR(512),
-	PRIMARY KEY (id),
-	UNIQUE KEY `$fk_name` (a, b),
-	FOREIGN KEY (a, b) REFERENCES `$t1_name` (a, b)
-	ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=INNODB;
-
-eval INSERT INTO `$t1_name` VALUES (1, $key_str);
-eval INSERT INTO `$t2_name` VALUES (100, 1, $key_str), (101, 3, $key_str);
-
-SET SESSION foreign_key_checks=1;
-
--- enable_result_log
-
--- error ER_FOREIGN_DUPLICATE_KEY
-eval UPDATE IGNORE `$t1_name` SET a = 3;
-
-eval DROP TABLE `$t2_name`, `$t1_name`;

=== removed file 'mysql-test/suite/innodb/t/innodb_cmp_drop_table-master.opt.moved'
--- a/mysql-test/suite/innodb/t/innodb_cmp_drop_table-master.opt.moved	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/innodb/t/innodb_cmp_drop_table-master.opt.moved	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb-buffer-pool-size=8M

=== removed file 'mysql-test/suite/innodb/t/innodb_cmp_drop_table.test.moved'
--- a/mysql-test/suite/innodb/t/innodb_cmp_drop_table.test.moved	2012-02-23 12:37:59 +0000
+++ b/mysql-test/suite/innodb/t/innodb_cmp_drop_table.test.moved	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
--- source include/have_innodb.inc
-
-let $per_table=`select @@innodb_file_per_table`;
-let $format=`select @@innodb_file_format`;
-
--- let $query_i_s = SELECT page_size FROM information_schema.innodb_cmpmem WHERE pages_used > 0
-
-set global innodb_file_per_table=on;
-set global innodb_file_format=`1`;
- 
-create table t1(a text) engine=innodb key_block_size=8;
-
--- disable_query_log
-
-# insert some rows so we are using compressed pages
--- let $i = 10
-while ($i)
-{
-  insert into t1 values(repeat('abcdefghijklmnopqrstuvwxyz',100));
-  dec $i;
-}
--- enable_query_log
-
-# we should be using some 8K pages
--- eval $query_i_s
-
-drop table t1;
-
-# no lazy eviction at drop table in 5.1 and 5.5 there should be no
-# used 8K pages
--- eval $query_i_s
-
-# create a non-compressed table and insert enough into it to evict
-# compressed pages
-create table t2(a text) engine=innodb;
-
--- disable_query_log
-
--- let $i = 200
-while ($i)
-{
-  insert into t2 values(repeat('abcdefghijklmnopqrstuvwxyz',1000));
-  dec $i;
-}
-
--- enable_query_log
-
-# now there should be no 8K pages in the buffer pool
--- eval $query_i_s
-
-drop table t2;
-
-#
-# restore environment to the state it was before this test execution
-#
-
--- disable_query_log
-eval set global innodb_file_format=$format;
-eval set global innodb_file_per_table=$per_table;

=== modified file 'mysql-test/suite/innodb/t/innodb_corrupt_bit.test'
--- a/mysql-test/suite/innodb/t/innodb_corrupt_bit.test	2012-11-01 11:46:09 +0000
+++ b/mysql-test/suite/innodb/t/innodb_corrupt_bit.test	2012-11-01 19:18:18 +0000
@@ -8,10 +8,6 @@
 # cannot be created on windows
 --source include/not_windows.inc
 
-# Issues with innodb_change_buffering_debug on Windows, so the test scenario
-# cannot be created on windows
---source include/not_windows.inc
-
 # This test needs debug server
 --source include/have_debug.inc
 

=== modified file 'mysql-test/suite/ndb/t/disabled.def'
--- a/mysql-test/suite/ndb/t/disabled.def	2012-10-04 11:58:42 +0000
+++ b/mysql-test/suite/ndb/t/disabled.def	2012-11-01 19:18:18 +0000
@@ -9,7 +9,8 @@
 #  Do not use any TAB characters for whitespace.
 #
 ##############################################################################
-
+ndb_partition_list: Bug#14827952 PARTITION BY LIST AND RANGE FAILS TO PRUNE
+ndb_partition_range: Bug#14827952 PARTITION BY LIST AND RANGE FAILS TO PRUNE
 ndb_partition_error2 : Bug#40989 ndb_partition_error2 needs maintenance
 
 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
@@ -18,21 +19,3 @@ ndb_disconnect_ddl        : Bug#31853 fl
 
 ndb_dbug_lock : SEAGULL gsl locking order
 
-#left for reference until they work
-# ndb_alter_table : Waiting for adaption to WL#946a
-# ndb_dd_alter : Waiting for adaption to WL#946
-# ndb_condition_pushdown : Waiting for adaption to WL#946
-# ndb_dd_disk2memory : Waiting for adaption to WL#946
-# ndb_dist_priv : Waiting for adaption to WL#946
-# ndb_dist_priv_bug_13340854 : Waiting for adaption to WL#946
-# ndb_rpl_stm_innodb : Waiting for adaption to WL#946
-# ndb_index_ordered : Waiting for adaption to WL#946
-# ndb_rpl_dd_advance : Waiting for adaption to WL#946
-# ndb_index_stat : Waiting for adaption to WL#946
-# ndb_partition_key : Waiting for adaption to WL#946
-# ndb_read_multi_range : Waiting for adaption to WL#946
-# ndb_restore_compat_compression : Waiting for adaption to WL#946
-# ndb_restore_misc : Waiting for adaption to WL#946
-# ndb_restore_schema_partitions : Waiting for adaption to WL#946
-# ps_7ndb : Waiting for adaption to WL#946
-

=== modified file 'mysql-test/suite/ndb/t/ndb_join_pushdown_bka.test'
--- a/mysql-test/suite/ndb/t/ndb_join_pushdown_bka.test	2011-11-16 14:47:33 +0000
+++ b/mysql-test/suite/ndb/t/ndb_join_pushdown_bka.test	2012-11-01 18:05:55 +0000
@@ -8,7 +8,11 @@
 #
 
 --source include/have_ndb.inc
---source include/have_batch_key_access.inc
+if (!`select locate('batch_key_access', @@global.optimizer_switch) > 0`)
+{
+  skip Need batch_key_access;
+}
+
 
 set @@global.optimizer_switch='batch_key_access=on';
 

=== modified file 'mysql-test/suite/ndb_memcache/t/disabled.def'
--- a/mysql-test/suite/ndb_memcache/t/disabled.def	2012-03-12 14:57:47 +0000
+++ b/mysql-test/suite/ndb_memcache/t/disabled.def	2012-10-29 16:15:38 +0000
@@ -1,15 +0,0 @@
-basic : Waiting for adaption to WL#946
-external_values : Waiting for adaption to WL#946
-lib_ascii : Waiting for adaption to WL#946
-lib_binary : Waiting for adaption to WL#946
-math1 : Waiting for adaption to WL#946
-math2 : Waiting for adaption to WL#946
-reconf1 : Waiting for adaption to WL#946
-tsv1 : Waiting for adaption to WL#946
-tsv2 : Waiting for adaption to WL#946
-ttls_flags : Waiting for adaption to WL#946
-type_char : Waiting for adaption to WL#946
-type_numeric : Waiting for adaption to WL#946
-type_signed : Waiting for adaption to WL#946
-type_unsigned : Waiting for adaption to WL#946
-unique_idx : Waiting for adaption to WL#946

=== removed file 'mysql-test/suite/perfschema/r/pfs_upgrade.result.THIS'
--- a/mysql-test/suite/perfschema/r/pfs_upgrade.result.THIS	2012-10-04 12:44:07 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade.result.THIS	1970-01-01 00:00:00 +0000
@@ -1,338 +0,0 @@
-drop table if exists test.user_table;
-drop procedure if exists test.user_proc;
-drop function if exists test.user_func;
-drop event if exists test.user_event;
-"Testing mysql_upgrade with TABLE performance_schema.user_table"
-create table test.user_table(a int);
-use performance_schema;
-show tables like "user_table";
-Tables_in_performance_schema (user_table)
-user_table
-Warning: Using a password on the command line interface can be insecure.
-Warning: Using a password on the command line interface can be insecure.
-Warning: Using a password on the command line interface can be insecure.
-ERROR 1050 (42S01) at line 159: Table 'cond_instances' already exists
-ERROR 1050 (42S01) at line 184: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 209: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 234: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 247: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 260: Table 'events_waits_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 273: Table 'events_waits_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 287: Table 'events_waits_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 300: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 312: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 321: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 350: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 381: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 394: Table 'socket_instances' already exists
-ERROR 1050 (42S01) at line 424: Table 'socket_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 453: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 488: Table 'host_cache' already exists
-ERROR 1050 (42S01) at line 497: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 511: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 521: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 531: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 540: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 548: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 557: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 568: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 576: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 621: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 665: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 744: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 764: Table 'threads' already exists
-ERROR 1050 (42S01) at line 780: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 796: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 812: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 825: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 838: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 851: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 865: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 877: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 923: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 969: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 1015: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 1047: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 1111: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 1144: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 1175: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 1184: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 1193: Table 'users' already exists
-ERROR 1050 (42S01) at line 1203: Table 'accounts' already exists
-ERROR 1050 (42S01) at line 1237: Table 'events_statements_summary_by_digest' already exists
-ERROR 1050 (42S01) at line 1247: Table 'session_connect_attrs' already exists
-ERROR 1050 (42S01) at line 1253: Table 'session_account_connect_attrs' already exists
-ERROR 1644 (HY000) at line 1990: Unexpected content found in the performance_schema database.
-FATAL ERROR: Upgrade failed
-show tables like "user_table";
-Tables_in_performance_schema (user_table)
-user_table
-use test;
-drop table test.user_table;
-"Testing mysql_upgrade with VIEW performance_schema.user_view"
-create view test.user_view as select "Not supposed to be here";
-use performance_schema;
-show tables like "user_view";
-Tables_in_performance_schema (user_view)
-user_view
-Warning: Using a password on the command line interface can be insecure.
-Warning: Using a password on the command line interface can be insecure.
-Warning: Using a password on the command line interface can be insecure.
-ERROR 1050 (42S01) at line 159: Table 'cond_instances' already exists
-ERROR 1050 (42S01) at line 184: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 209: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 234: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 247: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 260: Table 'events_waits_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 273: Table 'events_waits_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 287: Table 'events_waits_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 300: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 312: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 321: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 350: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 381: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 394: Table 'socket_instances' already exists
-ERROR 1050 (42S01) at line 424: Table 'socket_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 453: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 488: Table 'host_cache' already exists
-ERROR 1050 (42S01) at line 497: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 511: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 521: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 531: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 540: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 548: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 557: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 568: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 576: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 621: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 665: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 744: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 764: Table 'threads' already exists
-ERROR 1050 (42S01) at line 780: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 796: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 812: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 825: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 838: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 851: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 865: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 877: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 923: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 969: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 1015: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 1047: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 1111: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 1144: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 1175: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 1184: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 1193: Table 'users' already exists
-ERROR 1050 (42S01) at line 1203: Table 'accounts' already exists
-ERROR 1050 (42S01) at line 1237: Table 'events_statements_summary_by_digest' already exists
-ERROR 1050 (42S01) at line 1247: Table 'session_connect_attrs' already exists
-ERROR 1050 (42S01) at line 1253: Table 'session_account_connect_attrs' already exists
-ERROR 1644 (HY000) at line 1990: Unexpected content found in the performance_schema database.
-FATAL ERROR: Upgrade failed
-show tables like "user_view";
-Tables_in_performance_schema (user_view)
-user_view
-use test;
-drop view test.user_view;
-"Testing mysql_upgrade with PROCEDURE performance_schema.user_proc"
-create procedure test.user_proc()
-select "Not supposed to be here";
-update mysql.proc set db='performance_schema' where name='user_proc';
-Warning: Using a password on the command line interface can be insecure.
-Warning: Using a password on the command line interface can be insecure.
-Warning: Using a password on the command line interface can be insecure.
-ERROR 1050 (42S01) at line 159: Table 'cond_instances' already exists
-ERROR 1050 (42S01) at line 184: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 209: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 234: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 247: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 260: Table 'events_waits_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 273: Table 'events_waits_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 287: Table 'events_waits_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 300: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 312: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 321: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 350: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 381: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 394: Table 'socket_instances' already exists
-ERROR 1050 (42S01) at line 424: Table 'socket_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 453: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 488: Table 'host_cache' already exists
-ERROR 1050 (42S01) at line 497: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 511: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 521: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 531: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 540: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 548: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 557: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 568: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 576: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 621: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 665: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 744: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 764: Table 'threads' already exists
-ERROR 1050 (42S01) at line 780: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 796: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 812: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 825: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 838: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 851: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 865: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 877: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 923: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 969: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 1015: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 1047: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 1111: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 1144: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 1175: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 1184: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 1193: Table 'users' already exists
-ERROR 1050 (42S01) at line 1203: Table 'accounts' already exists
-ERROR 1050 (42S01) at line 1237: Table 'events_statements_summary_by_digest' already exists
-ERROR 1050 (42S01) at line 1247: Table 'session_connect_attrs' already exists
-ERROR 1050 (42S01) at line 1253: Table 'session_account_connect_attrs' already exists
-ERROR 1644 (HY000) at line 1990: Unexpected content found in the performance_schema database.
-FATAL ERROR: Upgrade failed
-select name from mysql.proc where db='performance_schema';
-name
-user_proc
-update mysql.proc set db='test' where name='user_proc';
-drop procedure test.user_proc;
-"Testing mysql_upgrade with FUNCTION performance_schema.user_func"
-create function test.user_func() returns integer
-return 0;
-update mysql.proc set db='performance_schema' where name='user_func';
-Warning: Using a password on the command line interface can be insecure.
-Warning: Using a password on the command line interface can be insecure.
-Warning: Using a password on the command line interface can be insecure.
-ERROR 1050 (42S01) at line 159: Table 'cond_instances' already exists
-ERROR 1050 (42S01) at line 184: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 209: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 234: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 247: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 260: Table 'events_waits_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 273: Table 'events_waits_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 287: Table 'events_waits_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 300: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 312: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 321: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 350: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 381: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 394: Table 'socket_instances' already exists
-ERROR 1050 (42S01) at line 424: Table 'socket_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 453: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 488: Table 'host_cache' already exists
-ERROR 1050 (42S01) at line 497: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 511: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 521: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 531: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 540: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 548: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 557: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 568: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 576: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 621: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 665: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 744: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 764: Table 'threads' already exists
-ERROR 1050 (42S01) at line 780: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 796: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 812: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 825: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 838: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 851: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 865: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 877: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 923: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 969: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 1015: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 1047: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 1111: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 1144: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 1175: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 1184: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 1193: Table 'users' already exists
-ERROR 1050 (42S01) at line 1203: Table 'accounts' already exists
-ERROR 1050 (42S01) at line 1237: Table 'events_statements_summary_by_digest' already exists
-ERROR 1050 (42S01) at line 1247: Table 'session_connect_attrs' already exists
-ERROR 1050 (42S01) at line 1253: Table 'session_account_connect_attrs' already exists
-ERROR 1644 (HY000) at line 1990: Unexpected content found in the performance_schema database.
-FATAL ERROR: Upgrade failed
-select name from mysql.proc where db='performance_schema';
-name
-user_func
-update mysql.proc set db='test' where name='user_func';
-drop function test.user_func;
-"Testing mysql_upgrade with EVENT performance_schema.user_event"
-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';
-Warning: Using a password on the command line interface can be insecure.
-Warning: Using a password on the command line interface can be insecure.
-Warning: Using a password on the command line interface can be insecure.
-ERROR 1050 (42S01) at line 159: Table 'cond_instances' already exists
-ERROR 1050 (42S01) at line 184: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 209: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 234: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 247: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 260: Table 'events_waits_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 273: Table 'events_waits_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 287: Table 'events_waits_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 300: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 312: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 321: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 350: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 381: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 394: Table 'socket_instances' already exists
-ERROR 1050 (42S01) at line 424: Table 'socket_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 453: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 488: Table 'host_cache' already exists
-ERROR 1050 (42S01) at line 497: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 511: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 521: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 531: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 540: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 548: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 557: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 568: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 576: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 621: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 665: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 744: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 764: Table 'threads' already exists
-ERROR 1050 (42S01) at line 780: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 796: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 812: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 825: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 838: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 851: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 865: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 877: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 923: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 969: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 1015: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 1047: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 1111: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 1144: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 1175: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 1184: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 1193: Table 'users' already exists
-ERROR 1050 (42S01) at line 1203: Table 'accounts' already exists
-ERROR 1050 (42S01) at line 1237: Table 'events_statements_summary_by_digest' already exists
-ERROR 1050 (42S01) at line 1247: Table 'session_connect_attrs' already exists
-ERROR 1050 (42S01) at line 1253: Table 'session_account_connect_attrs' already exists
-ERROR 1644 (HY000) at line 1990: Unexpected content found in the performance_schema database.
-FATAL ERROR: Upgrade failed
-select name from mysql.event where db='performance_schema';
-name
-user_event
-update mysql.event set db='test' where name='user_event';
-drop event test.user_event;

=== modified file 'mysql-test/suite/rpl_ndb/t/disabled.def'
--- a/mysql-test/suite/rpl_ndb/t/disabled.def	2012-10-04 11:58:42 +0000
+++ b/mysql-test/suite/rpl_ndb/t/disabled.def	2012-11-01 19:18:18 +0000
@@ -12,7 +12,3 @@
 
 rpl_ndb_set_null       : bug #51100
 rpl_ndb_row_implicit_commit_binlog : BUG#12586131 - fails on SET PASSWORD
-rpl_ndb_dist_priv : Waiting for adaption to WL#946
-rpl_ndb_extra_col_master : Waiting for adaption to WL#946
-rpl_ndb_extra_col_slave : Waiting for adaption to WL#946
-rpl_ndb_row_basic : Waiting for adaption to WL#946

=== modified file 'mysql-test/t/key_cache.test'
--- a/mysql-test/t/key_cache.test	2012-02-14 08:00:53 +0000
+++ b/mysql-test/t/key_cache.test	2012-11-01 18:59:17 +0000
@@ -251,3 +251,19 @@ SET GLOBAL key_cache_block_size= @bug284
 DROP TABLE t1;
 
 # End of 4.1 tests
+
+--echo #
+--echo # Bug#12361113: crash when load index into cache
+--echo #
+
+--echo # Note that this creates an empty disabled key cache!
+SET GLOBAL key_cache_none.key_cache_block_size = 1024;
+CREATE TABLE t1 (a INT, b INTEGER NOT NULL, KEY (b) ) ENGINE = MYISAM;
+INSERT INTO t1 VALUES (1, 1);
+--error ER_UNKNOWN_KEY_CACHE
+CACHE INDEX t1 in key_cache_none;
+--echo # The bug crashed the server at LOAD INDEX below. Now it will succeed 
+--echo # since the default cache is used due to CACHE INDEX failed for
+--echo # key_cache_none.
+LOAD INDEX INTO CACHE t1;
+DROP TABLE t1;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-cluster branch (magnus.blaudd:3550 to 3551) magnus.blaudd6 Nov