From: Tor Didriksen Date: January 3 2011 2:06pm Subject: bzr push into mysql-trunk branch (tor.didriksen:3319 to 3320) List-Archive: http://lists.mysql.com/commits/127795 Message-Id: <20110103140606.17A7A3773@atum07.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3320 Tor Didriksen 2011-01-03 [merge] automerge trunk => opt-backporting renamed: mysql-test/suite/funcs_1/r/myisam_views.result => mysql-test/suite/funcs_1/r/myisam_views-big.result mysql-test/suite/funcs_1/t/myisam_views.test => mysql-test/suite/funcs_1/t/myisam_views-big.test modified: .bzr-mysql/default.conf VERSION mysql-test/collections/default.experimental mysql-test/collections/default.weekly mysql-test/suite/funcs_1/t/myisam_views-big.test 3319 Tor Didriksen 2011-01-03 [merge] automerge trunk-bugfixing => opt-backporting removed: libmysqld/copyright mysql-test/r/ctype_utf8mb4_ndb.result mysql-test/suite/funcs_1/r/is_cml_ndb.result mysql-test/suite/funcs_1/r/is_columns_ndb.result mysql-test/suite/funcs_1/r/is_engines_ndb.result mysql-test/suite/funcs_1/r/is_tables_ndb.result mysql-test/suite/funcs_1/r/ndb_bitdata.result mysql-test/suite/funcs_1/r/ndb_cursors.result mysql-test/suite/funcs_1/r/ndb_func_view.result mysql-test/suite/funcs_1/r/ndb_storedproc_02.result mysql-test/suite/funcs_1/r/ndb_storedproc_03.result mysql-test/suite/funcs_1/r/ndb_storedproc_06.result mysql-test/suite/funcs_1/r/ndb_storedproc_07.result mysql-test/suite/funcs_1/r/ndb_storedproc_08.result mysql-test/suite/funcs_1/r/ndb_storedproc_10.result mysql-test/suite/funcs_1/r/ndb_trig_0102.result mysql-test/suite/funcs_1/r/ndb_trig_03.result mysql-test/suite/funcs_1/r/ndb_trig_03e.result mysql-test/suite/funcs_1/r/ndb_trig_0407.result mysql-test/suite/funcs_1/r/ndb_trig_08.result mysql-test/suite/funcs_1/r/ndb_trig_09.result mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result mysql-test/suite/funcs_1/r/ndb_views.result mysql-test/suite/funcs_1/t/is_cml_ndb.test mysql-test/suite/funcs_1/t/is_columns_ndb.test mysql-test/suite/funcs_1/t/is_engines_ndb.test mysql-test/suite/funcs_1/t/is_tables_ndb.test mysql-test/suite/funcs_1/t/ndb_bitdata.test mysql-test/suite/funcs_1/t/ndb_cursors.test mysql-test/suite/funcs_1/t/ndb_func_view.test mysql-test/suite/funcs_1/t/ndb_storedproc_02.test mysql-test/suite/funcs_1/t/ndb_storedproc_03.test mysql-test/suite/funcs_1/t/ndb_storedproc_06.test mysql-test/suite/funcs_1/t/ndb_storedproc_07.test mysql-test/suite/funcs_1/t/ndb_storedproc_08.test mysql-test/suite/funcs_1/t/ndb_storedproc_10.test mysql-test/suite/funcs_1/t/ndb_trig_0102.test mysql-test/suite/funcs_1/t/ndb_trig_03.test mysql-test/suite/funcs_1/t/ndb_trig_03e.test mysql-test/suite/funcs_1/t/ndb_trig_0407.test mysql-test/suite/funcs_1/t/ndb_trig_08.test mysql-test/suite/funcs_1/t/ndb_trig_09.test mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test mysql-test/suite/funcs_1/t/ndb_views.test mysql-test/suite/funcs_2/r/ndb_charset.result mysql-test/suite/funcs_2/t/ndb_charset.test mysql-test/suite/ndb/ mysql-test/suite/ndb/my.cnf mysql-test/suite/ndb/r/ mysql-test/suite/ndb/r/loaddata_autocom_ndb.result mysql-test/suite/ndb/r/ndb_alter_table.result mysql-test/suite/ndb/r/ndb_alter_table2.result mysql-test/suite/ndb/r/ndb_alter_table3.result mysql-test/suite/ndb/r/ndb_auto_increment.result mysql-test/suite/ndb/r/ndb_autoinc.result mysql-test/suite/ndb/r/ndb_basic.result mysql-test/suite/ndb/r/ndb_binlog_basic.result mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result mysql-test/suite/ndb/r/ndb_binlog_discover.result mysql-test/suite/ndb/r/ndb_binlog_format.result mysql-test/suite/ndb/r/ndb_binlog_ignore_db.result mysql-test/suite/ndb/r/ndb_binlog_log_bin.result mysql-test/suite/ndb/r/ndb_binlog_multi.result mysql-test/suite/ndb/r/ndb_bitfield.result mysql-test/suite/ndb/r/ndb_blob.result mysql-test/suite/ndb/r/ndb_blob_partition.result mysql-test/suite/ndb/r/ndb_bug26793.result mysql-test/suite/ndb/r/ndb_bug31477.result mysql-test/suite/ndb/r/ndb_cache.result mysql-test/suite/ndb/r/ndb_cache2.result mysql-test/suite/ndb/r/ndb_cache_multi.result mysql-test/suite/ndb/r/ndb_cache_multi2.result mysql-test/suite/ndb/r/ndb_charset.result mysql-test/suite/ndb/r/ndb_condition_pushdown.result mysql-test/suite/ndb/r/ndb_config.result mysql-test/suite/ndb/r/ndb_config2.result mysql-test/suite/ndb/r/ndb_cursor.result mysql-test/suite/ndb/r/ndb_database.result mysql-test/suite/ndb/r/ndb_dd_alter.result mysql-test/suite/ndb/r/ndb_dd_basic.result mysql-test/suite/ndb/r/ndb_dd_ddl.result mysql-test/suite/ndb/r/ndb_dd_disk2memory.result mysql-test/suite/ndb/r/ndb_dd_dump.result mysql-test/suite/ndb/r/ndb_dd_sql_features.result mysql-test/suite/ndb/r/ndb_gis.result mysql-test/suite/ndb/r/ndb_grant.result mysql-test/suite/ndb/r/ndb_index.result mysql-test/suite/ndb/r/ndb_index_ordered.result mysql-test/suite/ndb/r/ndb_index_unique.result mysql-test/suite/ndb/r/ndb_insert.result mysql-test/suite/ndb/r/ndb_limit.result mysql-test/suite/ndb/r/ndb_load.result mysql-test/suite/ndb/r/ndb_loaddatalocal.result mysql-test/suite/ndb/r/ndb_lock.result mysql-test/suite/ndb/r/ndb_lock_table.result mysql-test/suite/ndb/r/ndb_minmax.result mysql-test/suite/ndb/r/ndb_multi.result mysql-test/suite/ndb/r/ndb_multi_row.result mysql-test/suite/ndb/r/ndb_partition_error.result mysql-test/suite/ndb/r/ndb_partition_error2.result mysql-test/suite/ndb/r/ndb_partition_key.result mysql-test/suite/ndb/r/ndb_partition_list.result mysql-test/suite/ndb/r/ndb_partition_range.result mysql-test/suite/ndb/r/ndb_read_multi_range.result mysql-test/suite/ndb/r/ndb_rename.result mysql-test/suite/ndb/r/ndb_replace.result mysql-test/suite/ndb/r/ndb_restore.result mysql-test/suite/ndb/r/ndb_restore_compat.result mysql-test/suite/ndb/r/ndb_restore_different_endian_data.result mysql-test/suite/ndb/r/ndb_restore_partition.result mysql-test/suite/ndb/r/ndb_restore_print.result mysql-test/suite/ndb/r/ndb_row_format.result mysql-test/suite/ndb/r/ndb_single_user.result mysql-test/suite/ndb/r/ndb_sp.result mysql-test/suite/ndb/r/ndb_subquery.result mysql-test/suite/ndb/r/ndb_temporary.result mysql-test/suite/ndb/r/ndb_tmp_table_and_DDL.result mysql-test/suite/ndb/r/ndb_transaction.result mysql-test/suite/ndb/r/ndb_trigger.result mysql-test/suite/ndb/r/ndb_truncate.result mysql-test/suite/ndb/r/ndb_types.result mysql-test/suite/ndb/r/ndb_update.result mysql-test/suite/ndb/r/ndb_update_no_read.result mysql-test/suite/ndb/r/ndb_view.result mysql-test/suite/ndb/r/ndbapi.result mysql-test/suite/ndb/r/ps_7ndb.result mysql-test/suite/ndb/r/strict_autoinc_5ndb.result mysql-test/suite/ndb/t/ mysql-test/suite/ndb/t/disabled.def mysql-test/suite/ndb/t/loaddata_autocom_ndb.test mysql-test/suite/ndb/t/ndb_alter_table.test mysql-test/suite/ndb/t/ndb_alter_table2.test mysql-test/suite/ndb/t/ndb_alter_table3.test mysql-test/suite/ndb/t/ndb_auto_increment.test mysql-test/suite/ndb/t/ndb_autoinc.test mysql-test/suite/ndb/t/ndb_basic.test mysql-test/suite/ndb/t/ndb_binlog_basic.test mysql-test/suite/ndb/t/ndb_binlog_ddl_multi.test mysql-test/suite/ndb/t/ndb_binlog_discover.test mysql-test/suite/ndb/t/ndb_binlog_format.test mysql-test/suite/ndb/t/ndb_binlog_ignore_db-master.opt mysql-test/suite/ndb/t/ndb_binlog_ignore_db.test mysql-test/suite/ndb/t/ndb_binlog_log_bin.test mysql-test/suite/ndb/t/ndb_binlog_multi.test mysql-test/suite/ndb/t/ndb_bitfield.test mysql-test/suite/ndb/t/ndb_blob.test mysql-test/suite/ndb/t/ndb_blob_partition.test mysql-test/suite/ndb/t/ndb_bug26793.test mysql-test/suite/ndb/t/ndb_bug31477.test mysql-test/suite/ndb/t/ndb_cache.test mysql-test/suite/ndb/t/ndb_cache2.test mysql-test/suite/ndb/t/ndb_cache_multi.test mysql-test/suite/ndb/t/ndb_cache_multi2.test mysql-test/suite/ndb/t/ndb_charset.test mysql-test/suite/ndb/t/ndb_condition_pushdown.test mysql-test/suite/ndb/t/ndb_config.test mysql-test/suite/ndb/t/ndb_config2.test mysql-test/suite/ndb/t/ndb_cursor.test mysql-test/suite/ndb/t/ndb_database.test mysql-test/suite/ndb/t/ndb_dd_alter.test mysql-test/suite/ndb/t/ndb_dd_basic.test mysql-test/suite/ndb/t/ndb_dd_ddl.test mysql-test/suite/ndb/t/ndb_dd_disk2memory.test mysql-test/suite/ndb/t/ndb_dd_dump.test mysql-test/suite/ndb/t/ndb_dd_sql_features.test mysql-test/suite/ndb/t/ndb_gis.test mysql-test/suite/ndb/t/ndb_grant.later mysql-test/suite/ndb/t/ndb_index.test mysql-test/suite/ndb/t/ndb_index_ordered.test mysql-test/suite/ndb/t/ndb_index_unique.test mysql-test/suite/ndb/t/ndb_insert.test mysql-test/suite/ndb/t/ndb_limit.test mysql-test/suite/ndb/t/ndb_load.test mysql-test/suite/ndb/t/ndb_loaddatalocal.test mysql-test/suite/ndb/t/ndb_lock.test mysql-test/suite/ndb/t/ndb_lock_table.test mysql-test/suite/ndb/t/ndb_minmax.test mysql-test/suite/ndb/t/ndb_multi.test mysql-test/suite/ndb/t/ndb_multi_row.test mysql-test/suite/ndb/t/ndb_partition_error.test mysql-test/suite/ndb/t/ndb_partition_error2-master.opt mysql-test/suite/ndb/t/ndb_partition_error2.test mysql-test/suite/ndb/t/ndb_partition_key.test mysql-test/suite/ndb/t/ndb_partition_list.test mysql-test/suite/ndb/t/ndb_partition_range.test mysql-test/suite/ndb/t/ndb_read_multi_range.test mysql-test/suite/ndb/t/ndb_rename.test mysql-test/suite/ndb/t/ndb_replace.test mysql-test/suite/ndb/t/ndb_restore.test mysql-test/suite/ndb/t/ndb_restore_compat.test mysql-test/suite/ndb/t/ndb_restore_different_endian_data.test mysql-test/suite/ndb/t/ndb_restore_partition-master.opt mysql-test/suite/ndb/t/ndb_restore_partition.test mysql-test/suite/ndb/t/ndb_restore_print.test mysql-test/suite/ndb/t/ndb_row_format.test mysql-test/suite/ndb/t/ndb_single_user.test mysql-test/suite/ndb/t/ndb_sp.test mysql-test/suite/ndb/t/ndb_subquery.test mysql-test/suite/ndb/t/ndb_temporary.test mysql-test/suite/ndb/t/ndb_tmp_table_and_DDL.test mysql-test/suite/ndb/t/ndb_transaction.test mysql-test/suite/ndb/t/ndb_trigger.test mysql-test/suite/ndb/t/ndb_truncate.test mysql-test/suite/ndb/t/ndb_types.test mysql-test/suite/ndb/t/ndb_update.test mysql-test/suite/ndb/t/ndb_update_no_read.test mysql-test/suite/ndb/t/ndb_view.test mysql-test/suite/ndb/t/ndbapi.test mysql-test/suite/ndb/t/ps_7ndb.test mysql-test/suite/ndb/t/strict_autoinc_5ndb.test mysql-test/suite/ndb_team/ mysql-test/suite/ndb_team/r/ mysql-test/suite/ndb_team/r/ndb_autodiscover.result mysql-test/suite/ndb_team/r/ndb_autodiscover2.result mysql-test/suite/ndb_team/r/ndb_autodiscover3.result mysql-test/suite/ndb_team/r/ndb_backup_print.result mysql-test/suite/ndb_team/r/ndb_dd_backuprestore.result mysql-test/suite/ndb_team/r/rpl_ndb_dd_advance.result mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result mysql-test/suite/ndb_team/t/ mysql-test/suite/ndb_team/t/disabled.def mysql-test/suite/ndb_team/t/ndb_autodiscover.test mysql-test/suite/ndb_team/t/ndb_autodiscover2-master.opt mysql-test/suite/ndb_team/t/ndb_autodiscover2.test mysql-test/suite/ndb_team/t/ndb_autodiscover3.test mysql-test/suite/ndb_team/t/ndb_backup_print.test mysql-test/suite/ndb_team/t/ndb_dd_backuprestore.test mysql-test/suite/ndb_team/t/rpl_ndb_dd_advance.test mysql-test/suite/ndb_team/t/rpl_ndb_extraColMaster.test mysql-test/suite/ndb_team/t/rpl_ndb_mix_innodb-master.opt mysql-test/suite/ndb_team/t/rpl_ndb_mix_innodb.test mysql-test/suite/parts/r/ndb_dd_backuprestore.result mysql-test/suite/parts/r/part_supported_sql_func_ndb.result mysql-test/suite/parts/r/partition_alter1_1_2_ndb.result mysql-test/suite/parts/r/partition_alter1_1_ndb.result mysql-test/suite/parts/r/partition_alter1_2_ndb.result mysql-test/suite/parts/r/partition_auto_increment_ndb.result mysql-test/suite/parts/r/partition_engine_ndb.result mysql-test/suite/parts/r/partition_int_ndb.result mysql-test/suite/parts/r/partition_mgm_lc0_ndb.result mysql-test/suite/parts/r/partition_mgm_lc1_ndb.result mysql-test/suite/parts/r/partition_mgm_lc2_ndb.result mysql-test/suite/parts/r/partition_syntax_ndb.result mysql-test/suite/parts/r/partition_value_ndb.result mysql-test/suite/parts/t/ndb_dd_backuprestore.test mysql-test/suite/parts/t/part_supported_sql_func_ndb.test mysql-test/suite/parts/t/partition_alter1_1_2_ndb.test mysql-test/suite/parts/t/partition_alter1_1_ndb.test mysql-test/suite/parts/t/partition_alter1_2_ndb.test mysql-test/suite/parts/t/partition_auto_increment_ndb.test mysql-test/suite/parts/t/partition_basic_ndb.test mysql-test/suite/parts/t/partition_engine_ndb.test mysql-test/suite/parts/t/partition_int_ndb.test mysql-test/suite/parts/t/partition_mgm_lc0_ndb.test mysql-test/suite/parts/t/partition_mgm_lc1_ndb-master.opt mysql-test/suite/parts/t/partition_mgm_lc1_ndb.test mysql-test/suite/parts/t/partition_mgm_lc2_ndb-master.opt mysql-test/suite/parts/t/partition_mgm_lc2_ndb.test mysql-test/suite/parts/t/partition_syntax_ndb.test mysql-test/suite/parts/t/partition_value_ndb.test mysql-test/suite/rpl/r/rpl_row_tabledefs_7ndb.result mysql-test/suite/rpl_ndb/ mysql-test/suite/rpl_ndb/combinations mysql-test/suite/rpl_ndb/my.cnf mysql-test/suite/rpl_ndb/r/ mysql-test/suite/rpl_ndb/r/rpl_ndb_2innodb.result mysql-test/suite/rpl_ndb/r/rpl_ndb_2myisam.result mysql-test/suite/rpl_ndb/r/rpl_ndb_2ndb.result mysql-test/suite/rpl_ndb/r/rpl_ndb_2other.result mysql-test/suite/rpl_ndb/r/rpl_ndb_UUID.result mysql-test/suite/rpl_ndb/r/rpl_ndb_apply_status.result mysql-test/suite/rpl_ndb/r/rpl_ndb_auto_inc.result mysql-test/suite/rpl_ndb/r/rpl_ndb_bank.result mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result mysql-test/suite/rpl_ndb/r/rpl_ndb_blob.result mysql-test/suite/rpl_ndb/r/rpl_ndb_blob2.result mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result mysql-test/suite/rpl_ndb/r/rpl_ndb_commit_afterflush.result mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_basic.result mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_partitions.result mysql-test/suite/rpl_ndb/r/rpl_ndb_ddl.result mysql-test/suite/rpl_ndb/r/rpl_ndb_delete_nowhere.result mysql-test/suite/rpl_ndb/r/rpl_ndb_do_db.result mysql-test/suite/rpl_ndb/r/rpl_ndb_do_table.result mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result mysql-test/suite/rpl_ndb/r/rpl_ndb_func003.result mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb2ndb.result mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb_trans.result mysql-test/suite/rpl_ndb/r/rpl_ndb_insert_ignore.result mysql-test/suite/rpl_ndb/r/rpl_ndb_load.result mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_engines_transactions.result mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_implicit_commit_binlog.result mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_tables.result mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update2.result mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result mysql-test/suite/rpl_ndb/r/rpl_ndb_myisam2ndb.result mysql-test/suite/rpl_ndb/r/rpl_ndb_relayrotate.result mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_ignore.result mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result mysql-test/suite/rpl_ndb/r/rpl_ndb_row_img.result mysql-test/suite/rpl_ndb/r/rpl_ndb_row_implicit_commit_binlog.result mysql-test/suite/rpl_ndb/r/rpl_ndb_set_null.result mysql-test/suite/rpl_ndb/r/rpl_ndb_sp003.result mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result mysql-test/suite/rpl_ndb/r/rpl_ndb_trig004.result mysql-test/suite/rpl_ndb/r/rpl_ndbapi_multi.result mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result mysql-test/suite/rpl_ndb/t/ mysql-test/suite/rpl_ndb/t/disabled.def mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-master.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-master.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb.test mysql-test/suite/rpl_ndb/t/rpl_ndb_2other-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test mysql-test/suite/rpl_ndb/t/rpl_ndb_UUID.test mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status-master.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test mysql-test/suite/rpl_ndb/t/rpl_ndb_auto_inc.test mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors-master.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors.test mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test mysql-test/suite/rpl_ndb/t/rpl_ndb_blob2.test mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def-master.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_basic.test mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-master.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions.test mysql-test/suite/rpl_ndb/t/rpl_ndb_ddl.test mysql-test/suite/rpl_ndb/t/rpl_ndb_delete_nowhere.test mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db.test mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table.test mysql-test/suite/rpl_ndb/t/rpl_ndb_extraCol.test mysql-test/suite/rpl_ndb/t/rpl_ndb_func003.test mysql-test/suite/rpl_ndb/t/rpl_ndb_idempotent.test mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-master.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb.test mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test mysql-test/suite/rpl_ndb/t/rpl_ndb_insert_ignore.test mysql-test/suite/rpl_ndb/t/rpl_ndb_load.test mysql-test/suite/rpl_ndb/t/rpl_ndb_log-master.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_log.test mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions-master.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_implicit_commit_binlog.test mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables-master.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables.test mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2.test mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update3.test mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate.test mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore.test mysql-test/suite/rpl_ndb/t/rpl_ndb_row_001.test mysql-test/suite/rpl_ndb/t/rpl_ndb_row_img.cnf mysql-test/suite/rpl_ndb/t/rpl_ndb_row_img.test mysql-test/suite/rpl_ndb/t/rpl_ndb_row_implicit_commit_binlog.test mysql-test/suite/rpl_ndb/t/rpl_ndb_set_null.test mysql-test/suite/rpl_ndb/t/rpl_ndb_sp003.test mysql-test/suite/rpl_ndb/t/rpl_ndb_sp006.test mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-master.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test mysql-test/suite/rpl_ndb/t/rpl_ndb_trig004.test mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test mysql-test/suite/rpl_ndb/t/rpl_row_basic_7ndb.test mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb.test mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test mysql-test/suite/stress/r/ddl_ndb.result mysql-test/suite/stress/t/ddl_ndb.test mysql-test/t/ctype_utf8mb4_ndb.test storage/ndb/docs/doxygen/header.mgmapi.tex storage/ndb/docs/doxygen/header.ndbapi.tex storage/ndb/src/cw/cpcc-win32/vb6/ storage/ndb/src/cw/cpcc-win32/vb6/Computer.cls storage/ndb/src/cw/cpcc-win32/vb6/Database.cls storage/ndb/src/cw/cpcc-win32/vb6/Icon 110.ico storage/ndb/src/cw/cpcc-win32/vb6/Icon 231.ico storage/ndb/src/cw/cpcc-win32/vb6/Icon 237.ico storage/ndb/src/cw/cpcc-win32/vb6/Icon 241.ico storage/ndb/src/cw/cpcc-win32/vb6/Icon 242.ico storage/ndb/src/cw/cpcc-win32/vb6/Icon 270.ico storage/ndb/src/cw/cpcc-win32/vb6/Icon 271.ico storage/ndb/src/cw/cpcc-win32/vb6/Icon 273.ico storage/ndb/src/cw/cpcc-win32/vb6/Icon 31.ico storage/ndb/src/cw/cpcc-win32/vb6/Icon 337.ico storage/ndb/src/cw/cpcc-win32/vb6/Icon 338.ico storage/ndb/src/cw/cpcc-win32/vb6/Icon 339.ico storage/ndb/src/cw/cpcc-win32/vb6/MSSCCPRJ.SCC storage/ndb/src/cw/cpcc-win32/vb6/Module1.bas storage/ndb/src/cw/cpcc-win32/vb6/NdbCPC.vbp storage/ndb/src/cw/cpcc-win32/vb6/NdbCPC.vbw storage/ndb/src/cw/cpcc-win32/vb6/Process.cls storage/ndb/src/cw/cpcc-win32/vb6/closed folder.ico storage/ndb/src/cw/cpcc-win32/vb6/computer.ico storage/ndb/src/cw/cpcc-win32/vb6/frmAbout.frm storage/ndb/src/cw/cpcc-win32/vb6/frmLogin.frm storage/ndb/src/cw/cpcc-win32/vb6/frmMain.frm storage/ndb/src/cw/cpcc-win32/vb6/frmNewComputer.frm storage/ndb/src/cw/cpcc-win32/vb6/frmNewComputer.frx storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase.frx storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase1.frm storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase2.frm storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase2.log storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase3.frm storage/ndb/src/cw/cpcc-win32/vb6/frmOptions.frm storage/ndb/src/cw/cpcc-win32/vb6/frmSplash.frx storage/ndb/src/cw/cpcc-win32/vb6/networking.ico storage/ndb/src/cw/cpcc-win32/vb6/open folder.ico modified: BUILD/FINISH.sh BUILD/SETUP.sh BUILD/autorun.sh BUILD/build_mccge.sh BUILD/check-cpu BUILD/cleanup BUILD/cmake_configure.sh BUILD/compile-alpha BUILD/compile-alpha-debug BUILD/compile-amd64-debug-max BUILD/compile-amd64-debug-max-no-ndb BUILD/compile-amd64-gcov BUILD/compile-amd64-gprof BUILD/compile-amd64-max BUILD/compile-amd64-max-sci BUILD/compile-amd64-valgrind-max BUILD/compile-darwin-mwcc BUILD/compile-dist BUILD/compile-hpux11-parisc2-aCC BUILD/compile-ia64-debug-max BUILD/compile-irix-mips64-mipspro BUILD/compile-ndb-autotest BUILD/compile-pentium BUILD/compile-pentium-cybozu BUILD/compile-pentium-debug BUILD/compile-pentium-debug-max BUILD/compile-pentium-debug-max-no-embedded BUILD/compile-pentium-debug-max-no-ndb BUILD/compile-pentium-debug-openssl BUILD/compile-pentium-debug-yassl BUILD/compile-pentium-gcov BUILD/compile-pentium-gprof BUILD/compile-pentium-icc BUILD/compile-pentium-icc-valgrind-max BUILD/compile-pentium-icc-yassl BUILD/compile-pentium-max BUILD/compile-pentium-myodbc BUILD/compile-pentium-pgcc BUILD/compile-pentium-valgrind-max BUILD/compile-pentium-valgrind-max-no-ndb BUILD/compile-pentium64 BUILD/compile-pentium64-debug BUILD/compile-pentium64-debug-max BUILD/compile-pentium64-gcov BUILD/compile-pentium64-gprof BUILD/compile-pentium64-max BUILD/compile-pentium64-max-sci BUILD/compile-pentium64-valgrind-max BUILD/compile-ppc BUILD/compile-ppc-debug BUILD/compile-ppc-debug-max BUILD/compile-ppc-debug-max-no-ndb BUILD/compile-ppc-max BUILD/compile-solaris-amd64 BUILD/compile-solaris-amd64-debug BUILD/compile-solaris-amd64-forte BUILD/compile-solaris-amd64-forte-debug BUILD/compile-solaris-sparc BUILD/compile-solaris-sparc-debug BUILD/compile-solaris-sparc-forte BUILD/compile-solaris-sparc-purify client/completion_hash.h cmake/os/SunOS.cmake config.h.cmake configure.cmake dbug/dbug_add_tags.pl extra/yassl/examples/client/client.cpp extra/yassl/examples/echoclient/echoclient.cpp extra/yassl/examples/echoserver/echoserver.cpp extra/yassl/examples/server/server.cpp extra/yassl/include/lock.hpp extra/yassl/include/openssl/crypto.h extra/yassl/include/openssl/des.h extra/yassl/include/openssl/des_old.h extra/yassl/include/openssl/engine.h extra/yassl/include/openssl/err.h extra/yassl/include/openssl/evp.h extra/yassl/include/openssl/generate_prefix_files.pl extra/yassl/include/openssl/hmac.h extra/yassl/include/openssl/lhash.h extra/yassl/include/openssl/md4.h extra/yassl/include/openssl/md5.h extra/yassl/include/openssl/objects.h extra/yassl/include/openssl/opensslv.h extra/yassl/include/openssl/pem.h extra/yassl/include/openssl/pkcs12.h extra/yassl/include/openssl/prefix_crypto.h extra/yassl/include/openssl/prefix_ssl.h extra/yassl/include/openssl/rand.h extra/yassl/include/openssl/rsa.h extra/yassl/include/openssl/sha.h extra/yassl/include/openssl/x509.h extra/yassl/include/openssl/x509v3.h extra/yassl/src/lock.cpp extra/yassl/src/make.bat extra/yassl/taocrypt/benchmark/benchmark.cpp extra/yassl/taocrypt/benchmark/make.bat extra/yassl/taocrypt/src/make.bat extra/yassl/taocrypt/test/make.bat extra/yassl/taocrypt/test/memory.cpp extra/yassl/taocrypt/test/test.cpp extra/yassl/testsuite/make.bat extra/yassl/testsuite/test.hpp extra/yassl/testsuite/testsuite.cpp include/my_handler.h include/my_pthread.h include/my_sys.h include/mysql/psi/mysql_file.h include/mysql_com.h libmysqld/examples/test-run mysql-test/collections/default.experimental mysql-test/collections/default.weekly mysql-test/collections/mysql-trunk.daily mysql-test/collections/mysql-trunk.weekly mysql-test/extra/rpl_tests/rpl_auto_increment.test mysql-test/extra/rpl_tests/rpl_change_master.test mysql-test/extra/rpl_tests/rpl_crash_safe.inc mysql-test/include/check_ftwrl_compatible.inc mysql-test/include/check_ftwrl_incompatible.inc mysql-test/include/check_slave_param.inc mysql-test/include/diff_tables.inc mysql-test/include/rpl_change_topology.inc mysql-test/include/rpl_connect.inc mysql-test/include/rpl_diff.inc mysql-test/include/rpl_end.inc mysql-test/include/rpl_init.inc mysql-test/include/rpl_row_img_parts_master_slave.inc mysql-test/include/rpl_start_server.inc mysql-test/include/rpl_stop_server.inc mysql-test/include/sync_slave_io_with_master.inc mysql-test/include/wait_for_binlog_event.inc mysql-test/include/wait_for_slave_param.inc mysql-test/include/write_var_to_file.inc mysql-test/lib/mtr_cases.pm mysql-test/lib/mtr_process.pl mysql-test/lib/v1/mysql-test-run.pl mysql-test/mysql-stress-test.pl mysql-test/mysql-test-run.pl mysql-test/purify.supp mysql-test/r/func_group.result mysql-test/r/func_math.result mysql-test/r/mysqlbinlog.result mysql-test/suite/funcs_1/t/disabled.def mysql-test/suite/funcs_2/t/disabled.def mysql-test/suite/innodb/t/innodb_bug42419.test mysql-test/suite/parts/t/disabled.def mysql-test/suite/rpl/r/rpl_auto_increment.result mysql-test/suite/rpl/r/rpl_binlog_errors.result mysql-test/suite/rpl/r/rpl_checksum.result mysql-test/suite/rpl/r/rpl_do_grant.result mysql-test/suite/rpl/t/rpl_binlog_errors.test mysql-test/suite/rpl/t/rpl_checksum.test mysql-test/suite/rpl/t/rpl_do_grant.test mysql-test/suite/rpl/t/rpl_migration_crash_safe.test mysql-test/t/disabled.def mysql-test/t/func_group.test mysql-test/t/func_math.test mysql-test/t/mysqlbinlog.test mysql-test/valgrind.supp mysys/mf_pack.c mysys/ptr_cmp.c scripts/fill_help_tables.sql scripts/make_binary_distribution.sh scripts/make_win_bin_dist scripts/mysql_fix_extensions.sh scripts/mysql_setpermission.sh scripts/mysql_system_tables_data.sql scripts/mysql_system_tables_fix.sql scripts/mysql_test_data_timezone.sql scripts/mysqlaccess.sh scripts/mysqld_multi.sh scripts/mysqldumpslow.sh scripts/mysqlhotcopy.sh sql/field.cc sql/gen_lex_hash.cc sql/item.cc sql/item.h sql/item_cmpfunc.cc sql/item_cmpfunc.h sql/item_func.cc sql/item_subselect.cc sql/item_sum.cc sql/item_sum.h sql/log_event.cc sql/log_event.h sql/message.h sql/my_decimal.cc sql/mysqld.cc sql/protocol.cc sql/rpl_info.cc sql/rpl_info.h sql/rpl_info_factory.cc sql/rpl_mi.cc sql/rpl_mi.h sql/rpl_record.cc sql/rpl_record.h sql/rpl_rli.cc sql/rpl_rli.h sql/set_var.cc sql/set_var.h sql/share/charsets/languages.html sql/sql_audit.h sql/sql_insert.cc sql/sql_plugin.h sql/sql_show.cc sql/sys_vars.h storage/heap/hp_delete.c storage/innobase/buf/buf0buf.c storage/innobase/handler/i_s.cc storage/myisam/ftbench/Ecompare.pl storage/myisam/ftbench/Ecreate.pl storage/myisam/ftbench/Ereport.pl storage/myisam/ftbench/ft-test-run.sh storage/myisam/mi_test_all.sh storage/myisam/myisampack.c storage/myisam/rt_index.c storage/ndb/Makefile.am storage/ndb/config/make-win-dsw.sh storage/ndb/config/win-includes storage/ndb/config/win-libraries storage/ndb/config/win-name storage/ndb/config/win-sources storage/ndb/docs/Makefile.am storage/ndb/docs/doxygen/Doxyfile.mgmapi storage/ndb/docs/doxygen/Doxyfile.ndb storage/ndb/docs/doxygen/Doxyfile.ndbapi storage/ndb/docs/doxygen/Doxyfile.odbc storage/ndb/docs/doxygen/postdoxy.pl storage/ndb/docs/doxygen/predoxy.pl storage/ndb/src/cw/cpcc-win32/csharp/CPC_Form.cs storage/ndb/src/cw/cpcc-win32/csharp/Computer.cs storage/ndb/src/cw/cpcc-win32/csharp/ComputerAddDialog.cs storage/ndb/src/cw/cpcc-win32/csharp/ComputerRemoveDialog.cs storage/ndb/src/cw/cpcc-win32/csharp/Database.cs storage/ndb/src/cw/cpcc-win32/csharp/PanelWizard.cs storage/ndb/src/cw/cpcc-win32/csharp/Process.cs storage/ndb/src/cw/cpcc-win32/csharp/ProcessDefineDialog.cs storage/ndb/src/cw/cpcc-win32/csharp/fileaccess/FileMgmt.cs storage/ndb/src/cw/cpcc-win32/csharp/simpleparser/SimpleCPCParser.cs storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/SocketComm.cs storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/myTcpClient.cs storage/ndb/src/cw/cpcc-win32/csharp/startDatabaseDlg.cs storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs storage/ndb/src/libndb.ver.in storage/ndb/test/ndbapi/slow_select.cpp storage/ndb/test/ndbapi/testBitfield.cpp storage/ndb/test/ndbapi/testLcp.cpp storage/ndb/test/ndbnet/test.run storage/ndb/test/ndbnet/testError.run storage/ndb/test/ndbnet/testMNF.run storage/ndb/test/ndbnet/testNR.run storage/ndb/test/ndbnet/testNR1.run storage/ndb/test/ndbnet/testNR4.run storage/ndb/test/ndbnet/testSRhang.run storage/ndb/test/ndbnet/testTR295.run storage/ndb/test/run-test/16node-tests.txt storage/ndb/test/run-test/atrt-analyze-result.sh storage/ndb/test/run-test/atrt-clear-result.sh storage/ndb/test/run-test/atrt-gather-result.sh storage/ndb/test/run-test/atrt-mysql-test-run storage/ndb/test/run-test/atrt-setup.sh storage/ndb/test/run-test/atrt-testBackup storage/ndb/test/run-test/basic.txt storage/ndb/test/run-test/daily-basic-tests.txt storage/ndb/test/run-test/daily-devel-tests.txt storage/ndb/test/run-test/make-config.sh storage/ndb/test/run-test/make-html-reports.sh storage/ndb/test/run-test/make-index.sh storage/ndb/test/run-test/ndb-autotest.sh storage/ndb/test/sql/test_create_drop.pl storage/ndb/test/sql/test_range_bounds.pl storage/ndb/tools/clean-links.sh storage/ndb/tools/make-errors.pl storage/ndb/tools/make-links.sh storage/ndb/tools/ndb_error_reporter storage/ndb/tools/rgrep storage/perfschema/pfs_instr.cc support-files/MacOSX/Description.plist.sh support-files/MacOSX/Info.plist.sh support-files/MacOSX/MySQLCOM support-files/MacOSX/StartupItem.Description.plist support-files/MacOSX/StartupItem.Info.plist support-files/MacOSX/StartupItem.postinstall support-files/MacOSX/StartupParameters.plist.sh support-files/MacOSX/mwar-wrapper support-files/MacOSX/mwcc-wrapper support-files/MacOSX/postflight.sh support-files/MacOSX/preflight.sh support-files/RHEL4-SElinux/mysql.fc support-files/RHEL4-SElinux/mysql.te support-files/compiler_warnings.supp tests/big_record.pl tests/drop_test.pl tests/export.pl tests/fork2_test.pl tests/fork_big.pl tests/fork_big2.pl tests/grant.pl tests/index_corrupt.pl tests/insert_and_repair.pl tests/lock_test.pl tests/mysql_client_test.c tests/pmail.pl tests/rename_test.pl tests/table_types.pl tests/test_delayed_insert.pl tests/truncate.pl unittest/gunit/bounded_queue-t.cc unittest/gunit/mdl-t.cc unittest/gunit/mdl_mytap-t.cc unittest/gunit/my_regex-t.cc unittest/gunit/sql_list-t.cc unittest/gunit/thread_utils-t.cc unittest/gunit/thread_utils.cc === modified file '.bzr-mysql/default.conf' --- a/.bzr-mysql/default.conf 2011-01-03 12:10:18 +0000 +++ b/.bzr-mysql/default.conf 2011-01-03 14:05:01 +0000 @@ -1,4 +1,4 @@ [MYSQL] post_commit_to = "commits@stripped" post_push_to = "commits@stripped" -tree_name = "mysql-trunk-bugfixing" +tree_name = "mysql-trunk" === modified file 'VERSION' --- a/VERSION 2010-12-16 18:18:20 +0000 +++ b/VERSION 2010-12-23 15:11:54 +0000 @@ -1,4 +1,4 @@ MYSQL_VERSION_MAJOR=5 MYSQL_VERSION_MINOR=6 -MYSQL_VERSION_PATCH=1 +MYSQL_VERSION_PATCH=2 MYSQL_VERSION_EXTRA=-m5 === modified file 'mysql-test/collections/default.experimental' --- a/mysql-test/collections/default.experimental 2010-12-27 10:24:47 +0000 +++ b/mysql-test/collections/default.experimental 2010-12-31 13:04:32 +0000 @@ -4,7 +4,6 @@ binlog.binlog_multi_engine # joro : NDB tests marked as experimental as agreed with bochklin funcs_1.charset_collation_1 # depends on compile-time decisions -funcs_1.myisam_views @solaris # Bug#50595 2010-03-05 alik funcs_1.myisam_views takes longer time on 6.0 branch than 5.1 branch innodb.innodb_information_schema # Bug#48883 2010-05-11 alik Test "innodb_information_schema" takes fewer locks than expected @@ -14,7 +13,6 @@ main.gis-rtree @freebsd main.information_schema # Bug#47449 2009-09-19 alik main.information_schema and innodb.innodb_information_schema fail sporadically main.lock_multi_bug38499 # Bug#47448 2009-09-19 alik main.lock_multi_bug38499 times out sporadically main.lock_multi_bug38691 @solaris # Bug#47792 2009-10-02 alik main.lock_multi_bug38691 times out sporadically on Solaris 10 -main.log_tables # Bug#47924 2009-10-08 alik main.log_tables times out sporadically main.lowercase_table2 @darwin # Bug#55509 2010-07-26 alik main.lowercase_table2 fails on Mac OSX (again) main.mysqlslap @windows # Bug#54024 2010-08-10 alik mysqlslap fails sporadically starting from Dahlia main.outfile_loaddata @solaris # Bug#46895 2010-01-20 alik Test "outfile_loaddata" fails (reproducible) === modified file 'mysql-test/collections/default.weekly' --- a/mysql-test/collections/default.weekly 2010-12-20 14:19:35 +0000 +++ b/mysql-test/collections/default.weekly 2010-12-31 11:14:48 +0000 @@ -1,2 +1,2 @@ perl mysql-test-run.pl --timer --force --parallel=auto --comment=1st --experimental=collections/default.experimental 1st -perl mysql-test-run.pl --timer --force --parallel=auto --comment=big-tests --experimental=collections/default.experimental --vardir=var-big-tests --big-test --testcase-timeout=60 --suite-timeout=600 main.alter_table-big main.archive-big main.count_distinct3 main.create-big main.events_stress main.events_time_zone main.information_schema-big main.log_tables-big main.merge-big main.mysqlbinlog_row_big main.read_many_rows_innodb main.ssl-big main.sum_distinct-big main.type_newdecimal-big main.variables-big parts.part_supported_sql_func_innodb parts.partition_alter1_1_2_innodb parts.partition_alter1_2_innodb parts.partition_alter2_1_1_innodb parts.partition_alter2_1_2_innodb parts.partition_alter2_2_2_innodb parts.partition_alter4_innodb +perl mysql-test-run.pl --timer --force --parallel=auto --comment=big-tests --experimental=collections/default.experimental --vardir=var-big-tests --big-test --testcase-timeout=60 --suite-timeout=600 main.alter_table-big main.archive-big main.count_distinct3 main.create-big main.events_stress main.events_time_zone main.information_schema-big main.log_tables-big main.merge-big main.mysqlbinlog_row_big main.read_many_rows_innodb main.ssl-big main.sum_distinct-big main.type_newdecimal-big main.variables-big parts.part_supported_sql_func_innodb parts.partition_alter1_1_2_innodb parts.partition_alter1_2_innodb parts.partition_alter2_1_1_innodb parts.partition_alter2_1_2_innodb parts.partition_alter2_2_2_innodb parts.partition_alter4_innodb funcs_1.myisam_views-big === renamed file 'mysql-test/suite/funcs_1/r/myisam_views.result' => 'mysql-test/suite/funcs_1/r/myisam_views-big.result' === renamed file 'mysql-test/suite/funcs_1/t/myisam_views.test' => 'mysql-test/suite/funcs_1/t/myisam_views-big.test' --- a/mysql-test/suite/funcs_1/t/myisam_views.test 2009-06-09 14:36:14 +0000 +++ b/mysql-test/suite/funcs_1/t/myisam_views-big.test 2010-12-31 11:07:34 +0000 @@ -1,6 +1,9 @@ #### suite/funcs_1/t/myisam_views.test --source include/no_valgrind_without_big.inc +# because of a pair of slow Solaris Sparc machines in pb2, +# this test is marked as big: +--source include/big_test.inc # MyISAM tables should be used # No bundle (reason: useless for push emails).