List:Commits« Previous MessageNext Message »
From:Marc Alff Date:April 13 2010 9:51am
Subject:bzr push into mysql-next-mr-bugfixing branch (marc.alff:3145)
View as plain text  
 3145 Marc Alff	2010-04-13 [merge]
      Merge mysql-next-mr-bugfixing --> local bugfix branch

    added:
      include/mysql/innodb_priv.h
      include/password.h
      mysql-test/include/min_null_cond.inc
      mysql-test/include/view_alias.inc
      mysql-test/r/log_tables_upgrade.result
      mysql-test/r/plugin_not_embedded.result
      mysql-test/r/view_alias.result
      mysql-test/std_data/bug48265.frm
      mysql-test/std_data/bug49823.CSM
      mysql-test/std_data/bug49823.CSV
      mysql-test/std_data/bug49823.frm
      mysql-test/suite/engines/
      mysql-test/suite/engines/README
      mysql-test/suite/engines/funcs/
      mysql-test/suite/engines/funcs/r/
      mysql-test/suite/engines/funcs/r/ai_init_alter_table.result
      mysql-test/suite/engines/funcs/r/ai_init_create_table.result
      mysql-test/suite/engines/funcs/r/ai_init_insert.result
      mysql-test/suite/engines/funcs/r/ai_init_insert_id.result
      mysql-test/suite/engines/funcs/r/ai_overflow_error.result
      mysql-test/suite/engines/funcs/r/ai_reset_by_truncate.result
      mysql-test/suite/engines/funcs/r/ai_sql_auto_is_null.result
      mysql-test/suite/engines/funcs/r/an_calendar.result
      mysql-test/suite/engines/funcs/r/an_number.result
      mysql-test/suite/engines/funcs/r/an_string.result
      mysql-test/suite/engines/funcs/r/comment_column.result
      mysql-test/suite/engines/funcs/r/comment_column2.result
      mysql-test/suite/engines/funcs/r/comment_table.result
      mysql-test/suite/engines/funcs/r/crash_manycolumns_number.result
      mysql-test/suite/engines/funcs/r/crash_manycolumns_string.result
      mysql-test/suite/engines/funcs/r/crash_manyindexes_number.result
      mysql-test/suite/engines/funcs/r/crash_manyindexes_string.result
      mysql-test/suite/engines/funcs/r/crash_manytables_number.result
      mysql-test/suite/engines/funcs/r/crash_manytables_string.result
      mysql-test/suite/engines/funcs/r/date_function.result
      mysql-test/suite/engines/funcs/r/datetime_function.result
      mysql-test/suite/engines/funcs/r/db_alter_character_set.result
      mysql-test/suite/engines/funcs/r/db_alter_character_set_collate.result
      mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result
      mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result
      mysql-test/suite/engines/funcs/r/db_create_character_set.result
      mysql-test/suite/engines/funcs/r/db_create_character_set_collate.result
      mysql-test/suite/engines/funcs/r/db_create_drop.result
      mysql-test/suite/engines/funcs/r/db_create_error.result
      mysql-test/suite/engines/funcs/r/db_create_error_reserved.result
      mysql-test/suite/engines/funcs/r/db_create_if_not_exists.result
      mysql-test/suite/engines/funcs/r/db_drop_error.result
      mysql-test/suite/engines/funcs/r/db_use_error.result
      mysql-test/suite/engines/funcs/r/de_autoinc.result
      mysql-test/suite/engines/funcs/r/de_calendar_range.result
      mysql-test/suite/engines/funcs/r/de_ignore.result
      mysql-test/suite/engines/funcs/r/de_limit.result
      mysql-test/suite/engines/funcs/r/de_multi_db_table.result
      mysql-test/suite/engines/funcs/r/de_multi_db_table_using.result
      mysql-test/suite/engines/funcs/r/de_multi_table.result
      mysql-test/suite/engines/funcs/r/de_multi_table_using.result
      mysql-test/suite/engines/funcs/r/de_number_range.result
      mysql-test/suite/engines/funcs/r/de_quick.result
      mysql-test/suite/engines/funcs/r/de_string_range.result
      mysql-test/suite/engines/funcs/r/de_truncate.result
      mysql-test/suite/engines/funcs/r/de_truncate_autoinc.result
      mysql-test/suite/engines/funcs/r/fu_aggregate_avg_number.result
      mysql-test/suite/engines/funcs/r/fu_aggregate_count_number.result
      mysql-test/suite/engines/funcs/r/fu_aggregate_max_number.result
      mysql-test/suite/engines/funcs/r/fu_aggregate_max_subquery.result
      mysql-test/suite/engines/funcs/r/fu_aggregate_min_number.result
      mysql-test/suite/engines/funcs/r/fu_aggregate_sum_number.result
      mysql-test/suite/engines/funcs/r/general_no_data.result
      mysql-test/suite/engines/funcs/r/general_not_null.result
      mysql-test/suite/engines/funcs/r/general_null.result
      mysql-test/suite/engines/funcs/r/in_calendar_2_unique_constraints_duplicate_update.result
      mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_duplicate_update.result
      mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_error.result
      mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_ignore.result
      mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_duplicate_update.result
      mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_error.result
      mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_ignore.result
      mysql-test/suite/engines/funcs/r/in_enum_null.result
      mysql-test/suite/engines/funcs/r/in_enum_null_boundary_error.result
      mysql-test/suite/engines/funcs/r/in_enum_null_large_error.result
      mysql-test/suite/engines/funcs/r/in_insert_select.result
      mysql-test/suite/engines/funcs/r/in_insert_select_autoinc.result
      mysql-test/suite/engines/funcs/r/in_insert_select_unique_violation.result
      mysql-test/suite/engines/funcs/r/in_lob_boundary_error.result
      mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_duplicate_update.result
      mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_error.result
      mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_ignore.result
      mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_duplicate_update.result
      mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_error.result
      mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_ignore.result
      mysql-test/suite/engines/funcs/r/in_multicolumn_number_pk_constraint_duplicate_update.result
      mysql-test/suite/engines/funcs/r/in_multicolumn_number_pk_constraint_error.result
      mysql-test/suite/engines/funcs/r/in_multicolumn_number_pk_constraint_ignore.result
      mysql-test/suite/engines/funcs/r/in_multicolumn_number_unique_constraint_duplicate_update.result
      mysql-test/suite/engines/funcs/r/in_multicolumn_number_unique_constraint_error.result
      mysql-test/suite/engines/funcs/r/in_multicolumn_number_unique_constraint_ignore.result
      mysql-test/suite/engines/funcs/r/in_multicolumn_string_pk_constraint_duplicate_update.result
      mysql-test/suite/engines/funcs/r/in_multicolumn_string_pk_constraint_error.result
      mysql-test/suite/engines/funcs/r/in_multicolumn_string_pk_constraint_ignore.result
      mysql-test/suite/engines/funcs/r/in_multicolumn_string_unique_constraint_duplicate_update.result
      mysql-test/suite/engines/funcs/r/in_multicolumn_string_unique_constraint_error.result
      mysql-test/suite/engines/funcs/r/in_multicolumn_string_unique_constraint_ignore.result
      mysql-test/suite/engines/funcs/r/in_number_2_unique_constraints_duplicate_update.result
      mysql-test/suite/engines/funcs/r/in_number_boundary_error.result
      mysql-test/suite/engines/funcs/r/in_number_decimal_boundary_error.result
      mysql-test/suite/engines/funcs/r/in_number_length.result
      mysql-test/suite/engines/funcs/r/in_number_null.result
      mysql-test/suite/engines/funcs/r/in_number_pk_constraint_duplicate_update.result
      mysql-test/suite/engines/funcs/r/in_number_pk_constraint_error.result
      mysql-test/suite/engines/funcs/r/in_number_pk_constraint_ignore.result
      mysql-test/suite/engines/funcs/r/in_number_unique_constraint_duplicate_update.result
      mysql-test/suite/engines/funcs/r/in_number_unique_constraint_error.result
      mysql-test/suite/engines/funcs/r/in_number_unique_constraint_ignore.result
      mysql-test/suite/engines/funcs/r/in_set_null.result
      mysql-test/suite/engines/funcs/r/in_set_null_boundary_error.result
      mysql-test/suite/engines/funcs/r/in_set_null_large.result
      mysql-test/suite/engines/funcs/r/in_string_2_unique_constraints_duplicate_update.result
      mysql-test/suite/engines/funcs/r/in_string_boundary_error.result
      mysql-test/suite/engines/funcs/r/in_string_not_null.result
      mysql-test/suite/engines/funcs/r/in_string_null.result
      mysql-test/suite/engines/funcs/r/in_string_pk_constraint_duplicate_update.result
      mysql-test/suite/engines/funcs/r/in_string_pk_constraint_error.result
      mysql-test/suite/engines/funcs/r/in_string_pk_constraint_ignore.result
      mysql-test/suite/engines/funcs/r/in_string_set_enum_fail.result
      mysql-test/suite/engines/funcs/r/in_string_unique_constraint_duplicate_update.result
      mysql-test/suite/engines/funcs/r/in_string_unique_constraint_error.result
      mysql-test/suite/engines/funcs/r/in_string_unique_constraint_ignore.result
      mysql-test/suite/engines/funcs/r/ix_drop.result
      mysql-test/suite/engines/funcs/r/ix_drop_error.result
      mysql-test/suite/engines/funcs/r/ix_index_decimals.result
      mysql-test/suite/engines/funcs/r/ix_index_lob.result
      mysql-test/suite/engines/funcs/r/ix_index_non_string.result
      mysql-test/suite/engines/funcs/r/ix_index_string.result
      mysql-test/suite/engines/funcs/r/ix_index_string_length.result
      mysql-test/suite/engines/funcs/r/ix_unique_decimals.result
      mysql-test/suite/engines/funcs/r/ix_unique_lob.result
      mysql-test/suite/engines/funcs/r/ix_unique_non_string.result
      mysql-test/suite/engines/funcs/r/ix_unique_string.result
      mysql-test/suite/engines/funcs/r/ix_unique_string_length.result
      mysql-test/suite/engines/funcs/r/ix_using_order.result
      mysql-test/suite/engines/funcs/r/jp_comment_column.result
      mysql-test/suite/engines/funcs/r/jp_comment_older_compatibility1.result
      mysql-test/suite/engines/funcs/r/jp_comment_table.result
      mysql-test/suite/engines/funcs/r/ld_all_number_string_calendar_types.result
      mysql-test/suite/engines/funcs/r/ld_bit.result
      mysql-test/suite/engines/funcs/r/ld_enum_set.result
      mysql-test/suite/engines/funcs/r/ld_less_columns.result
      mysql-test/suite/engines/funcs/r/ld_more_columns_truncated.result
      mysql-test/suite/engines/funcs/r/ld_null.result
      mysql-test/suite/engines/funcs/r/ld_quote.result
      mysql-test/suite/engines/funcs/r/ld_simple.result
      mysql-test/suite/engines/funcs/r/ld_starting.result
      mysql-test/suite/engines/funcs/r/ld_unique_error1.result
      mysql-test/suite/engines/funcs/r/ld_unique_error1_local.result
      mysql-test/suite/engines/funcs/r/ld_unique_error2.result
      mysql-test/suite/engines/funcs/r/ld_unique_error2_local.result
      mysql-test/suite/engines/funcs/r/ld_unique_error3.result
      mysql-test/suite/engines/funcs/r/ld_unique_error3_local.result
      mysql-test/suite/engines/funcs/r/ps_number_length.result
      mysql-test/suite/engines/funcs/r/ps_number_null.result
      mysql-test/suite/engines/funcs/r/ps_string_not_null.result
      mysql-test/suite/engines/funcs/r/ps_string_null.result
      mysql-test/suite/engines/funcs/r/re_number_range.result
      mysql-test/suite/engines/funcs/r/re_number_range_set.result
      mysql-test/suite/engines/funcs/r/re_number_select.result
      mysql-test/suite/engines/funcs/r/re_string_range.result
      mysql-test/suite/engines/funcs/r/re_string_range_set.result
      mysql-test/suite/engines/funcs/r/rpl000010.result
      mysql-test/suite/engines/funcs/r/rpl000011.result
      mysql-test/suite/engines/funcs/r/rpl000013.result
      mysql-test/suite/engines/funcs/r/rpl000017.result
      mysql-test/suite/engines/funcs/r/rpl_000015.result
      mysql-test/suite/engines/funcs/r/rpl_LD_INFILE.result
      mysql-test/suite/engines/funcs/r/rpl_REDIRECT.result
      mysql-test/suite/engines/funcs/r/rpl_alter.result
      mysql-test/suite/engines/funcs/r/rpl_alter_db.result
      mysql-test/suite/engines/funcs/r/rpl_bit.result
      mysql-test/suite/engines/funcs/r/rpl_bit_npk.result
      mysql-test/suite/engines/funcs/r/rpl_change_master.result
      mysql-test/suite/engines/funcs/r/rpl_create_database.result
      mysql-test/suite/engines/funcs/r/rpl_do_grant.result
      mysql-test/suite/engines/funcs/r/rpl_drop.result
      mysql-test/suite/engines/funcs/r/rpl_drop_db.result
      mysql-test/suite/engines/funcs/r/rpl_dual_pos_advance.result
      mysql-test/suite/engines/funcs/r/rpl_empty_master_crash.result
      mysql-test/suite/engines/funcs/r/rpl_err_ignoredtable.result
      mysql-test/suite/engines/funcs/r/rpl_flushlog_loop.result
      mysql-test/suite/engines/funcs/r/rpl_free_items.result
      mysql-test/suite/engines/funcs/r/rpl_get_lock.result
      mysql-test/suite/engines/funcs/r/rpl_ignore_grant.result
      mysql-test/suite/engines/funcs/r/rpl_ignore_revoke.result
      mysql-test/suite/engines/funcs/r/rpl_ignore_table_update.result
      mysql-test/suite/engines/funcs/r/rpl_init_slave.result
      mysql-test/suite/engines/funcs/r/rpl_insert.result
      mysql-test/suite/engines/funcs/r/rpl_insert_select.result
      mysql-test/suite/engines/funcs/r/rpl_loaddata2.result
      mysql-test/suite/engines/funcs/r/rpl_loaddata_m.result
      mysql-test/suite/engines/funcs/r/rpl_loaddata_s.result
      mysql-test/suite/engines/funcs/r/rpl_loaddatalocal.result
      mysql-test/suite/engines/funcs/r/rpl_loadfile.result
      mysql-test/suite/engines/funcs/r/rpl_log_pos.result
      mysql-test/suite/engines/funcs/r/rpl_many_optimize.result
      mysql-test/suite/engines/funcs/r/rpl_master_pos_wait.result
      mysql-test/suite/engines/funcs/r/rpl_misc_functions.result
      mysql-test/suite/engines/funcs/r/rpl_multi_delete.result
      mysql-test/suite/engines/funcs/r/rpl_multi_delete2.result
      mysql-test/suite/engines/funcs/r/rpl_multi_update4.result
      mysql-test/suite/engines/funcs/r/rpl_ps.result
      mysql-test/suite/engines/funcs/r/rpl_rbr_to_sbr.result
      mysql-test/suite/engines/funcs/r/rpl_relayspace.result
      mysql-test/suite/engines/funcs/r/rpl_replicate_ignore_db.result
      mysql-test/suite/engines/funcs/r/rpl_row_NOW.result
      mysql-test/suite/engines/funcs/r/rpl_row_USER.result
      mysql-test/suite/engines/funcs/r/rpl_row_drop.result
      mysql-test/suite/engines/funcs/r/rpl_row_func001.result
      mysql-test/suite/engines/funcs/r/rpl_row_inexist_tbl.result
      mysql-test/suite/engines/funcs/r/rpl_row_max_relay_size.result
      mysql-test/suite/engines/funcs/r/rpl_row_reset_slave.result
      mysql-test/suite/engines/funcs/r/rpl_row_sp001.result
      mysql-test/suite/engines/funcs/r/rpl_row_sp005.result
      mysql-test/suite/engines/funcs/r/rpl_row_sp008.result
      mysql-test/suite/engines/funcs/r/rpl_row_sp009.result
      mysql-test/suite/engines/funcs/r/rpl_row_sp010.result
      mysql-test/suite/engines/funcs/r/rpl_row_sp011.result
      mysql-test/suite/engines/funcs/r/rpl_row_sp012.result
      mysql-test/suite/engines/funcs/r/rpl_row_stop_middle.result
      mysql-test/suite/engines/funcs/r/rpl_row_trig001.result
      mysql-test/suite/engines/funcs/r/rpl_row_trig002.result
      mysql-test/suite/engines/funcs/r/rpl_row_trig003.result
      mysql-test/suite/engines/funcs/r/rpl_row_until.result
      mysql-test/suite/engines/funcs/r/rpl_row_view01.result
      mysql-test/suite/engines/funcs/r/rpl_server_id1.result
      mysql-test/suite/engines/funcs/r/rpl_server_id2.result
      mysql-test/suite/engines/funcs/r/rpl_session_var.result
      mysql-test/suite/engines/funcs/r/rpl_sf.result
      mysql-test/suite/engines/funcs/r/rpl_skip_error.result
      mysql-test/suite/engines/funcs/r/rpl_slave_status.result
      mysql-test/suite/engines/funcs/r/rpl_sp.result
      mysql-test/suite/engines/funcs/r/rpl_sp004.result
      mysql-test/suite/engines/funcs/r/rpl_sp_effects.result
      mysql-test/suite/engines/funcs/r/rpl_start_stop_slave.result
      mysql-test/suite/engines/funcs/r/rpl_stm_max_relay_size.result
      mysql-test/suite/engines/funcs/r/rpl_stm_mystery22.result
      mysql-test/suite/engines/funcs/r/rpl_stm_no_op.result
      mysql-test/suite/engines/funcs/r/rpl_stm_reset_slave.result
      mysql-test/suite/engines/funcs/r/rpl_switch_stm_row_mixed.result
      mysql-test/suite/engines/funcs/r/rpl_temp_table.result
      mysql-test/suite/engines/funcs/r/rpl_temporary.result
      mysql-test/suite/engines/funcs/r/rpl_trigger.result
      mysql-test/suite/engines/funcs/r/rpl_trunc_temp.result
      mysql-test/suite/engines/funcs/r/rpl_user_variables.result
      mysql-test/suite/engines/funcs/r/rpl_variables.result
      mysql-test/suite/engines/funcs/r/rpl_view.result
      mysql-test/suite/engines/funcs/r/se_join_cross.result
      mysql-test/suite/engines/funcs/r/se_join_default.result
      mysql-test/suite/engines/funcs/r/se_join_inner.result
      mysql-test/suite/engines/funcs/r/se_join_left.result
      mysql-test/suite/engines/funcs/r/se_join_left_outer.result
      mysql-test/suite/engines/funcs/r/se_join_natural_left.result
      mysql-test/suite/engines/funcs/r/se_join_natural_left_outer.result
      mysql-test/suite/engines/funcs/r/se_join_natural_right.result
      mysql-test/suite/engines/funcs/r/se_join_natural_right_outer.result
      mysql-test/suite/engines/funcs/r/se_join_right.result
      mysql-test/suite/engines/funcs/r/se_join_right_outer.result
      mysql-test/suite/engines/funcs/r/se_join_straight.result
      mysql-test/suite/engines/funcs/r/se_rowid.result
      mysql-test/suite/engines/funcs/r/se_string_distinct.result
      mysql-test/suite/engines/funcs/r/se_string_from.result
      mysql-test/suite/engines/funcs/r/se_string_groupby.result
      mysql-test/suite/engines/funcs/r/se_string_having.result
      mysql-test/suite/engines/funcs/r/se_string_limit.result
      mysql-test/suite/engines/funcs/r/se_string_orderby.result
      mysql-test/suite/engines/funcs/r/se_string_union.result
      mysql-test/suite/engines/funcs/r/se_string_where.result
      mysql-test/suite/engines/funcs/r/se_string_where_and.result
      mysql-test/suite/engines/funcs/r/se_string_where_or.result
      mysql-test/suite/engines/funcs/r/sf_alter.result
      mysql-test/suite/engines/funcs/r/sf_cursor.result
      mysql-test/suite/engines/funcs/r/sf_simple1.result
      mysql-test/suite/engines/funcs/r/sp_alter.result
      mysql-test/suite/engines/funcs/r/sp_cursor.result
      mysql-test/suite/engines/funcs/r/sp_simple1.result
      mysql-test/suite/engines/funcs/r/sq_all.result
      mysql-test/suite/engines/funcs/r/sq_any.result
      mysql-test/suite/engines/funcs/r/sq_corr.result
      mysql-test/suite/engines/funcs/r/sq_error.result
      mysql-test/suite/engines/funcs/r/sq_exists.result
      mysql-test/suite/engines/funcs/r/sq_from.result
      mysql-test/suite/engines/funcs/r/sq_in.result
      mysql-test/suite/engines/funcs/r/sq_row.result
      mysql-test/suite/engines/funcs/r/sq_scalar.result
      mysql-test/suite/engines/funcs/r/sq_some.result
      mysql-test/suite/engines/funcs/r/ta_2part_column_to_pk.result
      mysql-test/suite/engines/funcs/r/ta_2part_diff_string_to_pk.result
      mysql-test/suite/engines/funcs/r/ta_2part_diff_to_pk.result
      mysql-test/suite/engines/funcs/r/ta_2part_string_to_pk.result
      mysql-test/suite/engines/funcs/r/ta_3part_column_to_pk.result
      mysql-test/suite/engines/funcs/r/ta_3part_string_to_pk.result
      mysql-test/suite/engines/funcs/r/ta_add_column.result
      mysql-test/suite/engines/funcs/r/ta_add_column2.result
      mysql-test/suite/engines/funcs/r/ta_add_column_first.result
      mysql-test/suite/engines/funcs/r/ta_add_column_first2.result
      mysql-test/suite/engines/funcs/r/ta_add_column_middle.result
      mysql-test/suite/engines/funcs/r/ta_add_column_middle2.result
      mysql-test/suite/engines/funcs/r/ta_add_string.result
      mysql-test/suite/engines/funcs/r/ta_add_string2.result
      mysql-test/suite/engines/funcs/r/ta_add_string_first.result
      mysql-test/suite/engines/funcs/r/ta_add_string_first2.result
      mysql-test/suite/engines/funcs/r/ta_add_string_middle.result
      mysql-test/suite/engines/funcs/r/ta_add_string_middle2.result
      mysql-test/suite/engines/funcs/r/ta_add_string_unique_index.result
      mysql-test/suite/engines/funcs/r/ta_add_unique_index.result
      mysql-test/suite/engines/funcs/r/ta_column_from_unsigned.result
      mysql-test/suite/engines/funcs/r/ta_column_from_zerofill.result
      mysql-test/suite/engines/funcs/r/ta_column_to_index.result
      mysql-test/suite/engines/funcs/r/ta_column_to_not_null.result
      mysql-test/suite/engines/funcs/r/ta_column_to_null.result
      mysql-test/suite/engines/funcs/r/ta_column_to_pk.result
      mysql-test/suite/engines/funcs/r/ta_column_to_unsigned.result
      mysql-test/suite/engines/funcs/r/ta_column_to_zerofill.result
      mysql-test/suite/engines/funcs/r/ta_drop_column.result
      mysql-test/suite/engines/funcs/r/ta_drop_index.result
      mysql-test/suite/engines/funcs/r/ta_drop_pk_autoincrement.result
      mysql-test/suite/engines/funcs/r/ta_drop_pk_number.result
      mysql-test/suite/engines/funcs/r/ta_drop_pk_string.result
      mysql-test/suite/engines/funcs/r/ta_drop_string_index.result
      mysql-test/suite/engines/funcs/r/ta_orderby.result
      mysql-test/suite/engines/funcs/r/ta_rename.result
      mysql-test/suite/engines/funcs/r/ta_set_drop_default.result
      mysql-test/suite/engines/funcs/r/ta_string_drop_column.result
      mysql-test/suite/engines/funcs/r/ta_string_to_index.result
      mysql-test/suite/engines/funcs/r/ta_string_to_not_null.result
      mysql-test/suite/engines/funcs/r/ta_string_to_null.result
      mysql-test/suite/engines/funcs/r/ta_string_to_pk.result
      mysql-test/suite/engines/funcs/r/tc_column_autoincrement.result
      mysql-test/suite/engines/funcs/r/tc_column_comment.result
      mysql-test/suite/engines/funcs/r/tc_column_comment_string.result
      mysql-test/suite/engines/funcs/r/tc_column_default_decimal.result
      mysql-test/suite/engines/funcs/r/tc_column_default_number.result
      mysql-test/suite/engines/funcs/r/tc_column_default_string.result
      mysql-test/suite/engines/funcs/r/tc_column_enum.result
      mysql-test/suite/engines/funcs/r/tc_column_enum_long.result
      mysql-test/suite/engines/funcs/r/tc_column_key.result
      mysql-test/suite/engines/funcs/r/tc_column_key_length.result
      mysql-test/suite/engines/funcs/r/tc_column_length.result
      mysql-test/suite/engines/funcs/r/tc_column_length_decimals.result
      mysql-test/suite/engines/funcs/r/tc_column_length_zero.result
      mysql-test/suite/engines/funcs/r/tc_column_not_null.result
      mysql-test/suite/engines/funcs/r/tc_column_null.result
      mysql-test/suite/engines/funcs/r/tc_column_primary_key_number.result
      mysql-test/suite/engines/funcs/r/tc_column_primary_key_string.result
      mysql-test/suite/engines/funcs/r/tc_column_serial.result
      mysql-test/suite/engines/funcs/r/tc_column_set.result
      mysql-test/suite/engines/funcs/r/tc_column_set_long.result
      mysql-test/suite/engines/funcs/r/tc_column_unique_key.result
      mysql-test/suite/engines/funcs/r/tc_column_unique_key_string.result
      mysql-test/suite/engines/funcs/r/tc_column_unsigned.result
      mysql-test/suite/engines/funcs/r/tc_column_zerofill.result
      mysql-test/suite/engines/funcs/r/tc_drop_table.result
      mysql-test/suite/engines/funcs/r/tc_multicolumn_different.result
      mysql-test/suite/engines/funcs/r/tc_multicolumn_same.result
      mysql-test/suite/engines/funcs/r/tc_multicolumn_same_string.result
      mysql-test/suite/engines/funcs/r/tc_partition_analyze.result
      mysql-test/suite/engines/funcs/r/tc_partition_change_from_range_to_hash_key.result
      mysql-test/suite/engines/funcs/r/tc_partition_check.result
      mysql-test/suite/engines/funcs/r/tc_partition_hash.result
      mysql-test/suite/engines/funcs/r/tc_partition_hash_date_function.result
      mysql-test/suite/engines/funcs/r/tc_partition_key.result
      mysql-test/suite/engines/funcs/r/tc_partition_linear_key.result
      mysql-test/suite/engines/funcs/r/tc_partition_list_directory.result
      mysql-test/suite/engines/funcs/r/tc_partition_list_error.result
      mysql-test/suite/engines/funcs/r/tc_partition_optimize.result
      mysql-test/suite/engines/funcs/r/tc_partition_rebuild.result
      mysql-test/suite/engines/funcs/r/tc_partition_remove.result
      mysql-test/suite/engines/funcs/r/tc_partition_reorg_divide.result
      mysql-test/suite/engines/funcs/r/tc_partition_reorg_hash_key.result
      mysql-test/suite/engines/funcs/r/tc_partition_reorg_merge.result
      mysql-test/suite/engines/funcs/r/tc_partition_repair.result
      mysql-test/suite/engines/funcs/r/tc_partition_sub1.result
      mysql-test/suite/engines/funcs/r/tc_partition_sub2.result
      mysql-test/suite/engines/funcs/r/tc_partition_value.result
      mysql-test/suite/engines/funcs/r/tc_partition_value_error.result
      mysql-test/suite/engines/funcs/r/tc_partition_value_specific.result
      mysql-test/suite/engines/funcs/r/tc_rename.result
      mysql-test/suite/engines/funcs/r/tc_rename_across_database.result
      mysql-test/suite/engines/funcs/r/tc_rename_error.result
      mysql-test/suite/engines/funcs/r/tc_structure_comment.result
      mysql-test/suite/engines/funcs/r/tc_structure_create_like.result
      mysql-test/suite/engines/funcs/r/tc_structure_create_like_string.result
      mysql-test/suite/engines/funcs/r/tc_structure_create_select.result
      mysql-test/suite/engines/funcs/r/tc_structure_create_select_string.result
      mysql-test/suite/engines/funcs/r/tc_structure_string_comment.result
      mysql-test/suite/engines/funcs/r/tc_temporary_column.result
      mysql-test/suite/engines/funcs/r/tc_temporary_column_length.result
      mysql-test/suite/engines/funcs/r/time_function.result
      mysql-test/suite/engines/funcs/r/tr_all_type_triggers.result
      mysql-test/suite/engines/funcs/r/tr_delete.result
      mysql-test/suite/engines/funcs/r/tr_delete_new_error.result
      mysql-test/suite/engines/funcs/r/tr_insert.result
      mysql-test/suite/engines/funcs/r/tr_insert_after_error.result
      mysql-test/suite/engines/funcs/r/tr_insert_old_error.result
      mysql-test/suite/engines/funcs/r/tr_update.result
      mysql-test/suite/engines/funcs/r/tr_update_after_error.result
      mysql-test/suite/engines/funcs/r/up_calendar_range.result
      mysql-test/suite/engines/funcs/r/up_ignore.result
      mysql-test/suite/engines/funcs/r/up_limit.result
      mysql-test/suite/engines/funcs/r/up_multi_db_table.result
      mysql-test/suite/engines/funcs/r/up_multi_table.result
      mysql-test/suite/engines/funcs/r/up_nullcheck.result
      mysql-test/suite/engines/funcs/r/up_number_range.result
      mysql-test/suite/engines/funcs/r/up_string_range.result
      mysql-test/suite/engines/funcs/t/
      mysql-test/suite/engines/funcs/t/ai_init_alter_table.test
      mysql-test/suite/engines/funcs/t/ai_init_create_table.test
      mysql-test/suite/engines/funcs/t/ai_init_insert.test
      mysql-test/suite/engines/funcs/t/ai_init_insert_id.test
      mysql-test/suite/engines/funcs/t/ai_overflow_error.test
      mysql-test/suite/engines/funcs/t/ai_reset_by_truncate.test
      mysql-test/suite/engines/funcs/t/ai_sql_auto_is_null.test
      mysql-test/suite/engines/funcs/t/an_calendar.test
      mysql-test/suite/engines/funcs/t/an_number.test
      mysql-test/suite/engines/funcs/t/an_string.test
      mysql-test/suite/engines/funcs/t/comment_column.test
      mysql-test/suite/engines/funcs/t/comment_column2.test
      mysql-test/suite/engines/funcs/t/comment_table.test
      mysql-test/suite/engines/funcs/t/crash_manycolumns_number.test
      mysql-test/suite/engines/funcs/t/crash_manycolumns_string.test
      mysql-test/suite/engines/funcs/t/crash_manyindexes_number.test
      mysql-test/suite/engines/funcs/t/crash_manyindexes_string.test
      mysql-test/suite/engines/funcs/t/crash_manytables_number.test
      mysql-test/suite/engines/funcs/t/crash_manytables_string.test
      mysql-test/suite/engines/funcs/t/data1.inc
      mysql-test/suite/engines/funcs/t/data2.inc
      mysql-test/suite/engines/funcs/t/date_function.test
      mysql-test/suite/engines/funcs/t/datetime_function.test
      mysql-test/suite/engines/funcs/t/db_alter_character_set.test
      mysql-test/suite/engines/funcs/t/db_alter_character_set_collate.test
      mysql-test/suite/engines/funcs/t/db_alter_collate_ascii.test
      mysql-test/suite/engines/funcs/t/db_alter_collate_utf8.test
      mysql-test/suite/engines/funcs/t/db_create_character_set.test
      mysql-test/suite/engines/funcs/t/db_create_character_set_collate.test
      mysql-test/suite/engines/funcs/t/db_create_drop.test
      mysql-test/suite/engines/funcs/t/db_create_error.test
      mysql-test/suite/engines/funcs/t/db_create_error_reserved.test
      mysql-test/suite/engines/funcs/t/db_create_if_not_exists.test
      mysql-test/suite/engines/funcs/t/db_drop_error.test
      mysql-test/suite/engines/funcs/t/db_use_error.test
      mysql-test/suite/engines/funcs/t/de_autoinc.test
      mysql-test/suite/engines/funcs/t/de_calendar_range.test
      mysql-test/suite/engines/funcs/t/de_ignore.test
      mysql-test/suite/engines/funcs/t/de_limit.test
      mysql-test/suite/engines/funcs/t/de_multi_db_table.test
      mysql-test/suite/engines/funcs/t/de_multi_db_table_using.test
      mysql-test/suite/engines/funcs/t/de_multi_table.test
      mysql-test/suite/engines/funcs/t/de_multi_table_using.test
      mysql-test/suite/engines/funcs/t/de_number_range.test
      mysql-test/suite/engines/funcs/t/de_quick.test
      mysql-test/suite/engines/funcs/t/de_string_range.test
      mysql-test/suite/engines/funcs/t/de_truncate.test
      mysql-test/suite/engines/funcs/t/de_truncate_autoinc.test
      mysql-test/suite/engines/funcs/t/disabled.def
      mysql-test/suite/engines/funcs/t/fu_aggregate_avg_number.test
      mysql-test/suite/engines/funcs/t/fu_aggregate_count_number.test
      mysql-test/suite/engines/funcs/t/fu_aggregate_max_number.test
      mysql-test/suite/engines/funcs/t/fu_aggregate_max_subquery.test
      mysql-test/suite/engines/funcs/t/fu_aggregate_min_number.test
      mysql-test/suite/engines/funcs/t/fu_aggregate_sum_number.test
      mysql-test/suite/engines/funcs/t/general_no_data.test
      mysql-test/suite/engines/funcs/t/general_not_null.test
      mysql-test/suite/engines/funcs/t/general_null.test
      mysql-test/suite/engines/funcs/t/in_calendar_2_unique_constraints_duplicate_update.test
      mysql-test/suite/engines/funcs/t/in_calendar_pk_constraint_duplicate_update.test
      mysql-test/suite/engines/funcs/t/in_calendar_pk_constraint_error.test
      mysql-test/suite/engines/funcs/t/in_calendar_pk_constraint_ignore.test
      mysql-test/suite/engines/funcs/t/in_calendar_unique_constraint_duplicate_update.test
      mysql-test/suite/engines/funcs/t/in_calendar_unique_constraint_error.test
      mysql-test/suite/engines/funcs/t/in_calendar_unique_constraint_ignore.test
      mysql-test/suite/engines/funcs/t/in_enum_null.test
      mysql-test/suite/engines/funcs/t/in_enum_null_boundary_error.test
      mysql-test/suite/engines/funcs/t/in_enum_null_large_error.test
      mysql-test/suite/engines/funcs/t/in_insert_select.test
      mysql-test/suite/engines/funcs/t/in_insert_select_autoinc.test
      mysql-test/suite/engines/funcs/t/in_insert_select_unique_violation.test
      mysql-test/suite/engines/funcs/t/in_lob_boundary_error.test
      mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_pk_constraint_duplicate_update.test
      mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_pk_constraint_error.test
      mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_pk_constraint_ignore.test
      mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_unique_constraint_duplicate_update.test
      mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_unique_constraint_error.test
      mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_unique_constraint_ignore.test
      mysql-test/suite/engines/funcs/t/in_multicolumn_number_pk_constraint_duplicate_update.test
      mysql-test/suite/engines/funcs/t/in_multicolumn_number_pk_constraint_error.test
      mysql-test/suite/engines/funcs/t/in_multicolumn_number_pk_constraint_ignore.test
      mysql-test/suite/engines/funcs/t/in_multicolumn_number_unique_constraint_duplicate_update.test
      mysql-test/suite/engines/funcs/t/in_multicolumn_number_unique_constraint_error.test
      mysql-test/suite/engines/funcs/t/in_multicolumn_number_unique_constraint_ignore.test
      mysql-test/suite/engines/funcs/t/in_multicolumn_string_pk_constraint_duplicate_update.test
      mysql-test/suite/engines/funcs/t/in_multicolumn_string_pk_constraint_error.test
      mysql-test/suite/engines/funcs/t/in_multicolumn_string_pk_constraint_ignore.test
      mysql-test/suite/engines/funcs/t/in_multicolumn_string_unique_constraint_duplicate_update.test
      mysql-test/suite/engines/funcs/t/in_multicolumn_string_unique_constraint_error.test
      mysql-test/suite/engines/funcs/t/in_multicolumn_string_unique_constraint_ignore.test
      mysql-test/suite/engines/funcs/t/in_number_2_unique_constraints_duplicate_update.test
      mysql-test/suite/engines/funcs/t/in_number_boundary_error.test
      mysql-test/suite/engines/funcs/t/in_number_decimal_boundary_error.test
      mysql-test/suite/engines/funcs/t/in_number_length.test
      mysql-test/suite/engines/funcs/t/in_number_null.test
      mysql-test/suite/engines/funcs/t/in_number_pk_constraint_duplicate_update.test
      mysql-test/suite/engines/funcs/t/in_number_pk_constraint_error.test
      mysql-test/suite/engines/funcs/t/in_number_pk_constraint_ignore.test
      mysql-test/suite/engines/funcs/t/in_number_unique_constraint_duplicate_update.test
      mysql-test/suite/engines/funcs/t/in_number_unique_constraint_error.test
      mysql-test/suite/engines/funcs/t/in_number_unique_constraint_ignore.test
      mysql-test/suite/engines/funcs/t/in_set_null.test
      mysql-test/suite/engines/funcs/t/in_set_null_boundary_error.test
      mysql-test/suite/engines/funcs/t/in_set_null_large.test
      mysql-test/suite/engines/funcs/t/in_string_2_unique_constraints_duplicate_update.test
      mysql-test/suite/engines/funcs/t/in_string_boundary_error.test
      mysql-test/suite/engines/funcs/t/in_string_not_null.test
      mysql-test/suite/engines/funcs/t/in_string_null.test
      mysql-test/suite/engines/funcs/t/in_string_pk_constraint_duplicate_update.test
      mysql-test/suite/engines/funcs/t/in_string_pk_constraint_error.test
      mysql-test/suite/engines/funcs/t/in_string_pk_constraint_ignore.test
      mysql-test/suite/engines/funcs/t/in_string_set_enum_fail.test
      mysql-test/suite/engines/funcs/t/in_string_unique_constraint_duplicate_update.test
      mysql-test/suite/engines/funcs/t/in_string_unique_constraint_error.test
      mysql-test/suite/engines/funcs/t/in_string_unique_constraint_ignore.test
      mysql-test/suite/engines/funcs/t/ix_drop.test
      mysql-test/suite/engines/funcs/t/ix_drop_error.test
      mysql-test/suite/engines/funcs/t/ix_index_decimals.test
      mysql-test/suite/engines/funcs/t/ix_index_lob.test
      mysql-test/suite/engines/funcs/t/ix_index_non_string.test
      mysql-test/suite/engines/funcs/t/ix_index_string.test
      mysql-test/suite/engines/funcs/t/ix_index_string_length.test
      mysql-test/suite/engines/funcs/t/ix_unique_decimals.test
      mysql-test/suite/engines/funcs/t/ix_unique_lob.test
      mysql-test/suite/engines/funcs/t/ix_unique_non_string.test
      mysql-test/suite/engines/funcs/t/ix_unique_string.test
      mysql-test/suite/engines/funcs/t/ix_unique_string_length.test
      mysql-test/suite/engines/funcs/t/ix_using_order.test
      mysql-test/suite/engines/funcs/t/jp_comment_column.test
      mysql-test/suite/engines/funcs/t/jp_comment_older_compatibility1.test
      mysql-test/suite/engines/funcs/t/jp_comment_table.test
      mysql-test/suite/engines/funcs/t/ld_all_number_string_calendar_types.test
      mysql-test/suite/engines/funcs/t/ld_bit.test
      mysql-test/suite/engines/funcs/t/ld_enum_set.test
      mysql-test/suite/engines/funcs/t/ld_less_columns.test
      mysql-test/suite/engines/funcs/t/ld_more_columns_truncated.test
      mysql-test/suite/engines/funcs/t/ld_null.test
      mysql-test/suite/engines/funcs/t/ld_quote.test
      mysql-test/suite/engines/funcs/t/ld_simple.test
      mysql-test/suite/engines/funcs/t/ld_starting.test
      mysql-test/suite/engines/funcs/t/ld_unique_error1.test
      mysql-test/suite/engines/funcs/t/ld_unique_error1_local.test
      mysql-test/suite/engines/funcs/t/ld_unique_error2.test
      mysql-test/suite/engines/funcs/t/ld_unique_error2_local.test
      mysql-test/suite/engines/funcs/t/ld_unique_error3.test
      mysql-test/suite/engines/funcs/t/ld_unique_error3_local.test
      mysql-test/suite/engines/funcs/t/load_bit.inc
      mysql-test/suite/engines/funcs/t/load_enum_set.inc
      mysql-test/suite/engines/funcs/t/load_less_columns.inc
      mysql-test/suite/engines/funcs/t/load_more_columns.inc
      mysql-test/suite/engines/funcs/t/load_null.inc
      mysql-test/suite/engines/funcs/t/load_null2.inc
      mysql-test/suite/engines/funcs/t/load_quote.inc
      mysql-test/suite/engines/funcs/t/load_simple.inc
      mysql-test/suite/engines/funcs/t/load_starting.inc
      mysql-test/suite/engines/funcs/t/load_unique_error1.inc
      mysql-test/suite/engines/funcs/t/load_unique_error2.inc
      mysql-test/suite/engines/funcs/t/load_unique_error3.inc
      mysql-test/suite/engines/funcs/t/ps_number_length.test
      mysql-test/suite/engines/funcs/t/ps_number_null.test
      mysql-test/suite/engines/funcs/t/ps_string_not_null.test
      mysql-test/suite/engines/funcs/t/ps_string_null.test
      mysql-test/suite/engines/funcs/t/re_number_range.test
      mysql-test/suite/engines/funcs/t/re_number_range_set.test
      mysql-test/suite/engines/funcs/t/re_number_select.test
      mysql-test/suite/engines/funcs/t/re_string_range.test
      mysql-test/suite/engines/funcs/t/re_string_range_set.test
      mysql-test/suite/engines/funcs/t/rpl000010-slave.opt
      mysql-test/suite/engines/funcs/t/rpl000010.test
      mysql-test/suite/engines/funcs/t/rpl000011.test
      mysql-test/suite/engines/funcs/t/rpl000013.test
      mysql-test/suite/engines/funcs/t/rpl000017-slave.opt
      mysql-test/suite/engines/funcs/t/rpl000017.test
      mysql-test/suite/engines/funcs/t/rpl_000015.test
      mysql-test/suite/engines/funcs/t/rpl_LD_INFILE.test
      mysql-test/suite/engines/funcs/t/rpl_REDIRECT.test
      mysql-test/suite/engines/funcs/t/rpl_alter.test
      mysql-test/suite/engines/funcs/t/rpl_alter_db.test
      mysql-test/suite/engines/funcs/t/rpl_bit.test
      mysql-test/suite/engines/funcs/t/rpl_bit_npk.test
      mysql-test/suite/engines/funcs/t/rpl_change_master.test
      mysql-test/suite/engines/funcs/t/rpl_create_database-master.opt
      mysql-test/suite/engines/funcs/t/rpl_create_database-slave.opt
      mysql-test/suite/engines/funcs/t/rpl_create_database.test
      mysql-test/suite/engines/funcs/t/rpl_do_grant.test
      mysql-test/suite/engines/funcs/t/rpl_drop.test
      mysql-test/suite/engines/funcs/t/rpl_drop_db.test
      mysql-test/suite/engines/funcs/t/rpl_dual_pos_advance-master.opt
      mysql-test/suite/engines/funcs/t/rpl_dual_pos_advance.test
      mysql-test/suite/engines/funcs/t/rpl_empty_master_crash-master.opt
      mysql-test/suite/engines/funcs/t/rpl_empty_master_crash.test
      mysql-test/suite/engines/funcs/t/rpl_err_ignoredtable-slave.opt
      mysql-test/suite/engines/funcs/t/rpl_err_ignoredtable.test
      mysql-test/suite/engines/funcs/t/rpl_flushlog_loop.test
      mysql-test/suite/engines/funcs/t/rpl_free_items-slave.opt
      mysql-test/suite/engines/funcs/t/rpl_free_items.test
      mysql-test/suite/engines/funcs/t/rpl_get_lock.test
      mysql-test/suite/engines/funcs/t/rpl_ignore_grant-slave.opt
      mysql-test/suite/engines/funcs/t/rpl_ignore_grant.test
      mysql-test/suite/engines/funcs/t/rpl_ignore_revoke-slave.opt
      mysql-test/suite/engines/funcs/t/rpl_ignore_revoke.test
      mysql-test/suite/engines/funcs/t/rpl_ignore_table_update-slave.opt
      mysql-test/suite/engines/funcs/t/rpl_ignore_table_update.test
      mysql-test/suite/engines/funcs/t/rpl_init_slave-slave.opt
      mysql-test/suite/engines/funcs/t/rpl_init_slave.test
      mysql-test/suite/engines/funcs/t/rpl_insert.test
      mysql-test/suite/engines/funcs/t/rpl_insert_select.test
      mysql-test/suite/engines/funcs/t/rpl_loaddata2.test
      mysql-test/suite/engines/funcs/t/rpl_loaddata_m-master.opt
      mysql-test/suite/engines/funcs/t/rpl_loaddata_m.test
      mysql-test/suite/engines/funcs/t/rpl_loaddata_s-slave.opt
      mysql-test/suite/engines/funcs/t/rpl_loaddata_s.test
      mysql-test/suite/engines/funcs/t/rpl_loaddatalocal.test
      mysql-test/suite/engines/funcs/t/rpl_loadfile.test
      mysql-test/suite/engines/funcs/t/rpl_log_pos.test
      mysql-test/suite/engines/funcs/t/rpl_many_optimize.test
      mysql-test/suite/engines/funcs/t/rpl_master_pos_wait.test
      mysql-test/suite/engines/funcs/t/rpl_misc_functions.test
      mysql-test/suite/engines/funcs/t/rpl_multi_delete-slave.opt
      mysql-test/suite/engines/funcs/t/rpl_multi_delete.test
      mysql-test/suite/engines/funcs/t/rpl_multi_delete2-slave.opt
      mysql-test/suite/engines/funcs/t/rpl_multi_delete2.test
      mysql-test/suite/engines/funcs/t/rpl_multi_update4-slave.opt
      mysql-test/suite/engines/funcs/t/rpl_multi_update4.test
      mysql-test/suite/engines/funcs/t/rpl_ps.test
      mysql-test/suite/engines/funcs/t/rpl_rbr_to_sbr.test
      mysql-test/suite/engines/funcs/t/rpl_relayspace-slave.opt
      mysql-test/suite/engines/funcs/t/rpl_relayspace.test
      mysql-test/suite/engines/funcs/t/rpl_replicate_ignore_db-slave.opt
      mysql-test/suite/engines/funcs/t/rpl_replicate_ignore_db.test
      mysql-test/suite/engines/funcs/t/rpl_row_NOW.test
      mysql-test/suite/engines/funcs/t/rpl_row_USER.test
      mysql-test/suite/engines/funcs/t/rpl_row_drop.test
      mysql-test/suite/engines/funcs/t/rpl_row_func001.test
      mysql-test/suite/engines/funcs/t/rpl_row_inexist_tbl-slave.opt
      mysql-test/suite/engines/funcs/t/rpl_row_inexist_tbl.test
      mysql-test/suite/engines/funcs/t/rpl_row_max_relay_size.test
      mysql-test/suite/engines/funcs/t/rpl_row_reset_slave.test
      mysql-test/suite/engines/funcs/t/rpl_row_sp001.test
      mysql-test/suite/engines/funcs/t/rpl_row_sp005.test
      mysql-test/suite/engines/funcs/t/rpl_row_sp008.test
      mysql-test/suite/engines/funcs/t/rpl_row_sp009.test
      mysql-test/suite/engines/funcs/t/rpl_row_sp010.test
      mysql-test/suite/engines/funcs/t/rpl_row_sp011.test
      mysql-test/suite/engines/funcs/t/rpl_row_sp012.test
      mysql-test/suite/engines/funcs/t/rpl_row_stop_middle.test
      mysql-test/suite/engines/funcs/t/rpl_row_trig001.test
      mysql-test/suite/engines/funcs/t/rpl_row_trig002.test
      mysql-test/suite/engines/funcs/t/rpl_row_trig003.test
      mysql-test/suite/engines/funcs/t/rpl_row_until.test
      mysql-test/suite/engines/funcs/t/rpl_row_view01.test
      mysql-test/suite/engines/funcs/t/rpl_server_id1.test
      mysql-test/suite/engines/funcs/t/rpl_server_id2-slave.opt
      mysql-test/suite/engines/funcs/t/rpl_server_id2.test
      mysql-test/suite/engines/funcs/t/rpl_session_var.test
      mysql-test/suite/engines/funcs/t/rpl_sf.test
      mysql-test/suite/engines/funcs/t/rpl_skip_error-slave.opt
      mysql-test/suite/engines/funcs/t/rpl_skip_error.test
      mysql-test/suite/engines/funcs/t/rpl_slave_status.test
      mysql-test/suite/engines/funcs/t/rpl_sp-master.opt
      mysql-test/suite/engines/funcs/t/rpl_sp-slave.opt
      mysql-test/suite/engines/funcs/t/rpl_sp.test
      mysql-test/suite/engines/funcs/t/rpl_sp004.test
      mysql-test/suite/engines/funcs/t/rpl_sp_effects-master.opt
      mysql-test/suite/engines/funcs/t/rpl_sp_effects-slave.opt
      mysql-test/suite/engines/funcs/t/rpl_sp_effects.test
      mysql-test/suite/engines/funcs/t/rpl_start_stop_slave.test
      mysql-test/suite/engines/funcs/t/rpl_stm_max_relay_size.test
      mysql-test/suite/engines/funcs/t/rpl_stm_mystery22.test
      mysql-test/suite/engines/funcs/t/rpl_stm_no_op.test
      mysql-test/suite/engines/funcs/t/rpl_stm_reset_slave.test
      mysql-test/suite/engines/funcs/t/rpl_switch_stm_row_mixed.test
      mysql-test/suite/engines/funcs/t/rpl_temp_table.test
      mysql-test/suite/engines/funcs/t/rpl_temporary.test
      mysql-test/suite/engines/funcs/t/rpl_trigger.test
      mysql-test/suite/engines/funcs/t/rpl_trunc_temp.test
      mysql-test/suite/engines/funcs/t/rpl_user_variables.test
      mysql-test/suite/engines/funcs/t/rpl_variables-master.opt
      mysql-test/suite/engines/funcs/t/rpl_variables.test
      mysql-test/suite/engines/funcs/t/rpl_view-slave.opt
      mysql-test/suite/engines/funcs/t/rpl_view.test
      mysql-test/suite/engines/funcs/t/se_join_cross.test
      mysql-test/suite/engines/funcs/t/se_join_default.test
      mysql-test/suite/engines/funcs/t/se_join_inner.test
      mysql-test/suite/engines/funcs/t/se_join_left.test
      mysql-test/suite/engines/funcs/t/se_join_left_outer.test
      mysql-test/suite/engines/funcs/t/se_join_natural_left.test
      mysql-test/suite/engines/funcs/t/se_join_natural_left_outer.test
      mysql-test/suite/engines/funcs/t/se_join_natural_right.test
      mysql-test/suite/engines/funcs/t/se_join_natural_right_outer.test
      mysql-test/suite/engines/funcs/t/se_join_right.test
      mysql-test/suite/engines/funcs/t/se_join_right_outer.test
      mysql-test/suite/engines/funcs/t/se_join_straight.test
      mysql-test/suite/engines/funcs/t/se_rowid.test
      mysql-test/suite/engines/funcs/t/se_string_distinct.test
      mysql-test/suite/engines/funcs/t/se_string_from.test
      mysql-test/suite/engines/funcs/t/se_string_groupby.test
      mysql-test/suite/engines/funcs/t/se_string_having.test
      mysql-test/suite/engines/funcs/t/se_string_limit.test
      mysql-test/suite/engines/funcs/t/se_string_orderby.test
      mysql-test/suite/engines/funcs/t/se_string_union.test
      mysql-test/suite/engines/funcs/t/se_string_where.test
      mysql-test/suite/engines/funcs/t/se_string_where_and.test
      mysql-test/suite/engines/funcs/t/se_string_where_or.test
      mysql-test/suite/engines/funcs/t/sf_alter.test
      mysql-test/suite/engines/funcs/t/sf_cursor.test
      mysql-test/suite/engines/funcs/t/sf_simple1.test
      mysql-test/suite/engines/funcs/t/sp_alter.test
      mysql-test/suite/engines/funcs/t/sp_cursor.test
      mysql-test/suite/engines/funcs/t/sp_simple1.test
      mysql-test/suite/engines/funcs/t/sq_all.test
      mysql-test/suite/engines/funcs/t/sq_any.test
      mysql-test/suite/engines/funcs/t/sq_corr.test
      mysql-test/suite/engines/funcs/t/sq_error.test
      mysql-test/suite/engines/funcs/t/sq_exists.test
      mysql-test/suite/engines/funcs/t/sq_from.test
      mysql-test/suite/engines/funcs/t/sq_in.test
      mysql-test/suite/engines/funcs/t/sq_row.test
      mysql-test/suite/engines/funcs/t/sq_scalar.test
      mysql-test/suite/engines/funcs/t/sq_some.test
      mysql-test/suite/engines/funcs/t/ta_2part_column_to_pk.test
      mysql-test/suite/engines/funcs/t/ta_2part_diff_string_to_pk.test
      mysql-test/suite/engines/funcs/t/ta_2part_diff_to_pk.test
      mysql-test/suite/engines/funcs/t/ta_2part_string_to_pk.test
      mysql-test/suite/engines/funcs/t/ta_3part_column_to_pk.test
      mysql-test/suite/engines/funcs/t/ta_3part_string_to_pk.test
      mysql-test/suite/engines/funcs/t/ta_add_column.test
      mysql-test/suite/engines/funcs/t/ta_add_column2.test
      mysql-test/suite/engines/funcs/t/ta_add_column_first.test
      mysql-test/suite/engines/funcs/t/ta_add_column_first2.test
      mysql-test/suite/engines/funcs/t/ta_add_column_middle.test
      mysql-test/suite/engines/funcs/t/ta_add_column_middle2.test
      mysql-test/suite/engines/funcs/t/ta_add_string.test
      mysql-test/suite/engines/funcs/t/ta_add_string2.test
      mysql-test/suite/engines/funcs/t/ta_add_string_first.test
      mysql-test/suite/engines/funcs/t/ta_add_string_first2.test
      mysql-test/suite/engines/funcs/t/ta_add_string_middle.test
      mysql-test/suite/engines/funcs/t/ta_add_string_middle2.test
      mysql-test/suite/engines/funcs/t/ta_add_string_unique_index.test
      mysql-test/suite/engines/funcs/t/ta_add_unique_index.test
      mysql-test/suite/engines/funcs/t/ta_column_from_unsigned.test
      mysql-test/suite/engines/funcs/t/ta_column_from_zerofill.test
      mysql-test/suite/engines/funcs/t/ta_column_to_index.test
      mysql-test/suite/engines/funcs/t/ta_column_to_not_null.test
      mysql-test/suite/engines/funcs/t/ta_column_to_null.test
      mysql-test/suite/engines/funcs/t/ta_column_to_pk.test
      mysql-test/suite/engines/funcs/t/ta_column_to_unsigned.test
      mysql-test/suite/engines/funcs/t/ta_column_to_zerofill.test
      mysql-test/suite/engines/funcs/t/ta_drop_column.test
      mysql-test/suite/engines/funcs/t/ta_drop_index.test
      mysql-test/suite/engines/funcs/t/ta_drop_pk_autoincrement.test
      mysql-test/suite/engines/funcs/t/ta_drop_pk_number.test
      mysql-test/suite/engines/funcs/t/ta_drop_pk_string.test
      mysql-test/suite/engines/funcs/t/ta_drop_string_index.test
      mysql-test/suite/engines/funcs/t/ta_orderby.test
      mysql-test/suite/engines/funcs/t/ta_rename.test
      mysql-test/suite/engines/funcs/t/ta_set_drop_default.test
      mysql-test/suite/engines/funcs/t/ta_string_drop_column.test
      mysql-test/suite/engines/funcs/t/ta_string_to_index.test
      mysql-test/suite/engines/funcs/t/ta_string_to_not_null.test
      mysql-test/suite/engines/funcs/t/ta_string_to_null.test
      mysql-test/suite/engines/funcs/t/ta_string_to_pk.test
      mysql-test/suite/engines/funcs/t/tc_column_autoincrement.test
      mysql-test/suite/engines/funcs/t/tc_column_comment.test
      mysql-test/suite/engines/funcs/t/tc_column_comment_string.test
      mysql-test/suite/engines/funcs/t/tc_column_default_decimal.test
      mysql-test/suite/engines/funcs/t/tc_column_default_number.test
      mysql-test/suite/engines/funcs/t/tc_column_default_string.test
      mysql-test/suite/engines/funcs/t/tc_column_enum.test
      mysql-test/suite/engines/funcs/t/tc_column_enum_long.test
      mysql-test/suite/engines/funcs/t/tc_column_key.test
      mysql-test/suite/engines/funcs/t/tc_column_key_length.test
      mysql-test/suite/engines/funcs/t/tc_column_length.test
      mysql-test/suite/engines/funcs/t/tc_column_length_decimals.test
      mysql-test/suite/engines/funcs/t/tc_column_length_zero.test
      mysql-test/suite/engines/funcs/t/tc_column_not_null.test
      mysql-test/suite/engines/funcs/t/tc_column_null.test
      mysql-test/suite/engines/funcs/t/tc_column_primary_key_number.test
      mysql-test/suite/engines/funcs/t/tc_column_primary_key_string.test
      mysql-test/suite/engines/funcs/t/tc_column_serial.test
      mysql-test/suite/engines/funcs/t/tc_column_set.test
      mysql-test/suite/engines/funcs/t/tc_column_set_long.test
      mysql-test/suite/engines/funcs/t/tc_column_unique_key.test
      mysql-test/suite/engines/funcs/t/tc_column_unique_key_string.test
      mysql-test/suite/engines/funcs/t/tc_column_unsigned.test
      mysql-test/suite/engines/funcs/t/tc_column_zerofill.test
      mysql-test/suite/engines/funcs/t/tc_drop_table.test
      mysql-test/suite/engines/funcs/t/tc_multicolumn_different.test
      mysql-test/suite/engines/funcs/t/tc_multicolumn_same.test
      mysql-test/suite/engines/funcs/t/tc_multicolumn_same_string.test
      mysql-test/suite/engines/funcs/t/tc_partition_analyze.test
      mysql-test/suite/engines/funcs/t/tc_partition_change_from_range_to_hash_key.test
      mysql-test/suite/engines/funcs/t/tc_partition_check.test
      mysql-test/suite/engines/funcs/t/tc_partition_hash.test
      mysql-test/suite/engines/funcs/t/tc_partition_hash_date_function.test
      mysql-test/suite/engines/funcs/t/tc_partition_key.test
      mysql-test/suite/engines/funcs/t/tc_partition_linear_key.test
      mysql-test/suite/engines/funcs/t/tc_partition_list_directory.test
      mysql-test/suite/engines/funcs/t/tc_partition_list_error.test
      mysql-test/suite/engines/funcs/t/tc_partition_optimize.test
      mysql-test/suite/engines/funcs/t/tc_partition_rebuild.test
      mysql-test/suite/engines/funcs/t/tc_partition_remove.test
      mysql-test/suite/engines/funcs/t/tc_partition_reorg_divide.test
      mysql-test/suite/engines/funcs/t/tc_partition_reorg_hash_key.test
      mysql-test/suite/engines/funcs/t/tc_partition_reorg_merge.test
      mysql-test/suite/engines/funcs/t/tc_partition_repair.test
      mysql-test/suite/engines/funcs/t/tc_partition_sub1.test
      mysql-test/suite/engines/funcs/t/tc_partition_sub2.test
      mysql-test/suite/engines/funcs/t/tc_partition_value.test
      mysql-test/suite/engines/funcs/t/tc_partition_value_error.test
      mysql-test/suite/engines/funcs/t/tc_partition_value_specific.test
      mysql-test/suite/engines/funcs/t/tc_rename.test
      mysql-test/suite/engines/funcs/t/tc_rename_across_database.test
      mysql-test/suite/engines/funcs/t/tc_rename_error.test
      mysql-test/suite/engines/funcs/t/tc_structure_comment.test
      mysql-test/suite/engines/funcs/t/tc_structure_create_like.test
      mysql-test/suite/engines/funcs/t/tc_structure_create_like_string.test
      mysql-test/suite/engines/funcs/t/tc_structure_create_select.test
      mysql-test/suite/engines/funcs/t/tc_structure_create_select_string.test
      mysql-test/suite/engines/funcs/t/tc_structure_string_comment.test
      mysql-test/suite/engines/funcs/t/tc_temporary_column.test
      mysql-test/suite/engines/funcs/t/tc_temporary_column_length.test
      mysql-test/suite/engines/funcs/t/time_function.test
      mysql-test/suite/engines/funcs/t/tr_all_type_triggers.test
      mysql-test/suite/engines/funcs/t/tr_delete.test
      mysql-test/suite/engines/funcs/t/tr_delete_new_error.test
      mysql-test/suite/engines/funcs/t/tr_insert.test
      mysql-test/suite/engines/funcs/t/tr_insert_after_error.test
      mysql-test/suite/engines/funcs/t/tr_insert_old_error.test
      mysql-test/suite/engines/funcs/t/tr_update.test
      mysql-test/suite/engines/funcs/t/tr_update_after_error.test
      mysql-test/suite/engines/funcs/t/up_calendar_range.test
      mysql-test/suite/engines/funcs/t/up_ignore.test
      mysql-test/suite/engines/funcs/t/up_limit.test
      mysql-test/suite/engines/funcs/t/up_multi_db_table.test
      mysql-test/suite/engines/funcs/t/up_multi_table.test
      mysql-test/suite/engines/funcs/t/up_nullcheck.test
      mysql-test/suite/engines/funcs/t/up_number_range.test
      mysql-test/suite/engines/funcs/t/up_string_range.test
      mysql-test/suite/engines/funcs/t/wait_show_pattern.inc
      mysql-test/suite/engines/funcs/t/wait_slave_status.inc
      mysql-test/suite/engines/iuds/
      mysql-test/suite/engines/iuds/r/
      mysql-test/suite/engines/iuds/r/delete_decimal.result
      mysql-test/suite/engines/iuds/r/delete_time.result
      mysql-test/suite/engines/iuds/r/delete_year.result
      mysql-test/suite/engines/iuds/r/insert_calendar.result
      mysql-test/suite/engines/iuds/r/insert_decimal.result
      mysql-test/suite/engines/iuds/r/insert_number.result
      mysql-test/suite/engines/iuds/r/insert_time.result
      mysql-test/suite/engines/iuds/r/insert_year.result
      mysql-test/suite/engines/iuds/r/strings_charsets_update_delete.result
      mysql-test/suite/engines/iuds/r/strings_update_delete.result
      mysql-test/suite/engines/iuds/r/type_bit_iuds.result
      mysql-test/suite/engines/iuds/r/update_decimal.result
      mysql-test/suite/engines/iuds/r/update_delete_calendar.result
      mysql-test/suite/engines/iuds/r/update_delete_number.result
      mysql-test/suite/engines/iuds/r/update_time.result
      mysql-test/suite/engines/iuds/r/update_year.result
      mysql-test/suite/engines/iuds/t/
      mysql-test/suite/engines/iuds/t/delete_decimal.test
      mysql-test/suite/engines/iuds/t/delete_time.test
      mysql-test/suite/engines/iuds/t/delete_year.test
      mysql-test/suite/engines/iuds/t/disabled.def
      mysql-test/suite/engines/iuds/t/hindi.txt
      mysql-test/suite/engines/iuds/t/insert_calendar.test
      mysql-test/suite/engines/iuds/t/insert_decimal.test
      mysql-test/suite/engines/iuds/t/insert_number.test
      mysql-test/suite/engines/iuds/t/insert_time.test
      mysql-test/suite/engines/iuds/t/insert_year.test
      mysql-test/suite/engines/iuds/t/sample.txt
      mysql-test/suite/engines/iuds/t/strings_charsets_update_delete.test
      mysql-test/suite/engines/iuds/t/strings_update_delete.test
      mysql-test/suite/engines/iuds/t/type_bit_iuds.test
      mysql-test/suite/engines/iuds/t/update_decimal.test
      mysql-test/suite/engines/iuds/t/update_delete_calendar.test
      mysql-test/suite/engines/iuds/t/update_delete_number.test
      mysql-test/suite/engines/iuds/t/update_time.test
      mysql-test/suite/engines/iuds/t/update_year.test
      mysql-test/suite/engines/rr_trx/
      mysql-test/suite/engines/rr_trx/check_consistency.sql
      mysql-test/suite/engines/rr_trx/include/
      mysql-test/suite/engines/rr_trx/include/check_for_error_rollback.inc
      mysql-test/suite/engines/rr_trx/include/check_for_error_rollback_skip.inc
      mysql-test/suite/engines/rr_trx/include/check_repeatable_read_all_columns.inc
      mysql-test/suite/engines/rr_trx/include/record_query_all_columns.inc
      mysql-test/suite/engines/rr_trx/include/rr_init.test
      mysql-test/suite/engines/rr_trx/init_innodb.txt
      mysql-test/suite/engines/rr_trx/r/
      mysql-test/suite/engines/rr_trx/r/init_innodb.result
      mysql-test/suite/engines/rr_trx/r/rr_c_count_not_zero.result
      mysql-test/suite/engines/rr_trx/r/rr_c_stats.result
      mysql-test/suite/engines/rr_trx/r/rr_i_40-44.result
      mysql-test/suite/engines/rr_trx/r/rr_id_3.result
      mysql-test/suite/engines/rr_trx/r/rr_id_900.result
      mysql-test/suite/engines/rr_trx/r/rr_insert_select_2.result
      mysql-test/suite/engines/rr_trx/r/rr_iud_rollback-multi-50.result
      mysql-test/suite/engines/rr_trx/r/rr_replace_7-8.result
      mysql-test/suite/engines/rr_trx/r/rr_s_select-uncommitted.result
      mysql-test/suite/engines/rr_trx/r/rr_sc_select-limit-nolimit_4.result
      mysql-test/suite/engines/rr_trx/r/rr_sc_select-same_2.result
      mysql-test/suite/engines/rr_trx/r/rr_sc_sum_total.result
      mysql-test/suite/engines/rr_trx/r/rr_u_10-19.result
      mysql-test/suite/engines/rr_trx/r/rr_u_10-19_nolimit.result
      mysql-test/suite/engines/rr_trx/r/rr_u_4.result
      mysql-test/suite/engines/rr_trx/run.txt
      mysql-test/suite/engines/rr_trx/run_stress_tx_rr.pl
      mysql-test/suite/engines/rr_trx/t/
      mysql-test/suite/engines/rr_trx/t/init_innodb.test
      mysql-test/suite/engines/rr_trx/t/rr_c_count_not_zero.test
      mysql-test/suite/engines/rr_trx/t/rr_c_stats.test
      mysql-test/suite/engines/rr_trx/t/rr_i_40-44.test
      mysql-test/suite/engines/rr_trx/t/rr_id_3.test
      mysql-test/suite/engines/rr_trx/t/rr_id_900.test
      mysql-test/suite/engines/rr_trx/t/rr_insert_select_2.test
      mysql-test/suite/engines/rr_trx/t/rr_iud_rollback-multi-50.test
      mysql-test/suite/engines/rr_trx/t/rr_replace_7-8.test
      mysql-test/suite/engines/rr_trx/t/rr_s_select-uncommitted.test
      mysql-test/suite/engines/rr_trx/t/rr_sc_select-limit-nolimit_4.test
      mysql-test/suite/engines/rr_trx/t/rr_sc_select-same_2.test
      mysql-test/suite/engines/rr_trx/t/rr_sc_sum_total.test
      mysql-test/suite/engines/rr_trx/t/rr_u_10-19.test
      mysql-test/suite/engines/rr_trx/t/rr_u_10-19_nolimit.test
      mysql-test/suite/engines/rr_trx/t/rr_u_4.test
      mysql-test/suite/rpl/r/rpl_show_slave_running.result
      mysql-test/suite/rpl/r/rpl_stm_sql_mode.result
      mysql-test/suite/rpl/t/rpl_show_slave_running.test
      mysql-test/suite/rpl/t/rpl_stm_sql_mode.test
      mysql-test/t/log_tables_upgrade.test
      mysql-test/t/plugin_not_embedded-master.opt
      mysql-test/t/plugin_not_embedded.test
      mysql-test/t/view_alias.test
      sql/derror.h
      sql/des_key_file.h
      sql/discover.h
      sql/filesort.h
      sql/frm_crypt.h
      sql/hostname.h
      sql/init.h
      sql/key.h
      sql/lock.h
      sql/mysqld.h
      sql/sql_base.h
      sql/sql_binlog.h
      sql/sql_connect.h
      sql/sql_const.h
      sql/sql_db.h
      sql/sql_delete.h
      sql/sql_derived.h
      sql/sql_do.h
      sql/sql_handler.h
      sql/sql_help.h
      sql/sql_insert.h
      sql/sql_load.h
      sql/sql_locale.h
      sql/sql_manager.h
      sql/sql_parse.h
      sql/sql_rename.h
      sql/sql_table.h
      sql/sql_tablespace.h
      sql/sql_test.h
      sql/sql_time.h
      sql/sql_union.h
      sql/sql_update.h
      sql/strfunc.h
      sql/thr_malloc.h
    renamed:
      sql/mysql_priv.h => sql/sql_priv.h
      sql/time.cc => sql/sql_time.cc
    modified:
      .bzrignore
      client/Makefile.am
      client/client_priv.h
      client/mysql.cc
      client/mysql_upgrade.c
      client/mysqlbinlog.cc
      client/mysqltest.cc
      include/Makefile.am
      include/hash.h
      include/keycache.h
      include/m_ctype.h
      include/m_string.h
      include/my_dbug.h
      include/my_dir.h
      include/my_getopt.h
      include/my_global.h
      include/my_handler.h
      include/my_net.h
      include/my_pthread.h
      include/my_sys.h
      include/my_tree.h
      include/mysql/plugin.h
      include/mysql/psi/mysql_file.h
      include/mysys_err.h
      include/queues.h
      include/violite.h
      libmysql/Makefile.am
      libmysql/libmysql.c
      libmysqld/CMakeLists.txt
      libmysqld/Makefile.am
      libmysqld/emb_qcache.cc
      libmysqld/emb_qcache.h
      libmysqld/libmysqld.c
      mysql-test/Makefile.am
      mysql-test/collections/default.experimental
      mysql-test/collections/default.push
      mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test
      mysql-test/mysql-stress-test.pl
      mysql-test/r/compare.result
      mysql-test/r/ctype_ldml.result
      mysql-test/r/explain.result
      mysql-test/r/func_str.result
      mysql-test/r/gis-rtree.result
      mysql-test/r/group_by.result
      mysql-test/r/group_min_max.result
      mysql-test/r/having.result
      mysql-test/r/innodb_mysql.result
      mysql-test/r/join_outer.result
      mysql-test/r/merge.result
      mysql-test/r/metadata.result
      mysql-test/r/myisam.result
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/r/partition_error.result
      mysql-test/r/partition_innodb.result
      mysql-test/r/partition_pruning.result
      mysql-test/r/partition_range.result
      mysql-test/r/ps.result
      mysql-test/r/select.result
      mysql-test/r/subselect.result
      mysql-test/r/subselect3.result
      mysql-test/r/trigger.result
      mysql-test/r/type_date.result
      mysql-test/r/type_datetime.result
      mysql-test/r/type_year.result
      mysql-test/r/udf.result
      mysql-test/r/union.result
      mysql-test/r/update.result
      mysql-test/r/view.result
      mysql-test/r/xa.result
      mysql-test/suite/binlog/r/binlog_innodb_row.result
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
      mysql-test/suite/binlog/r/binlog_tmp_table.result
      mysql-test/suite/binlog/t/binlog_innodb_row.test
      mysql-test/suite/binlog/t/binlog_tmp_table.test
      mysql-test/suite/federated/federated.result
      mysql-test/suite/federated/federated.test
      mysql-test/suite/parts/inc/partition_auto_increment.inc
      mysql-test/suite/parts/r/partition_auto_increment_archive.result
      mysql-test/suite/parts/r/partition_auto_increment_blackhole.result
      mysql-test/suite/parts/r/partition_auto_increment_innodb.result
      mysql-test/suite/parts/r/partition_auto_increment_memory.result
      mysql-test/suite/parts/r/partition_auto_increment_myisam.result
      mysql-test/suite/parts/r/partition_auto_increment_ndb.result
      mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result
      mysql-test/suite/rpl/r/rpl_row_create_table.result
      mysql-test/suite/rpl/t/disabled.def
      mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
      mysql-test/suite/rpl/t/rpl_row_create_table.test
      mysql-test/t/ctype_ldml.test
      mysql-test/t/explain.test
      mysql-test/t/gis-rtree.test
      mysql-test/t/group_min_max.test
      mysql-test/t/having.test
      mysql-test/t/innodb_mysql.test
      mysql-test/t/join_outer.test
      mysql-test/t/merge.test
      mysql-test/t/metadata.test
      mysql-test/t/myisam.test
      mysql-test/t/mysql_upgrade.test
      mysql-test/t/partition_error.test
      mysql-test/t/partition_innodb.test
      mysql-test/t/partition_pruning.test
      mysql-test/t/partition_range.test
      mysql-test/t/trigger.test
      mysql-test/t/type_date.test
      mysql-test/t/type_year.test
      mysql-test/t/udf.test
      mysql-test/t/update.test
      mysql-test/t/xa.test
      mysys/charset.c
      mysys/my_init.c
      plugin/daemon_example/daemon_example.cc
      plugin/semisync/semisync.h
      plugin/semisync/semisync_master_plugin.cc
      plugin/semisync/semisync_slave_plugin.cc
      scripts/Makefile.am
      scripts/mysql_system_tables_fix.sql
      sql-common/client.c
      sql/CMakeLists.txt
      sql/Makefile.am
      sql/debug_sync.cc
      sql/debug_sync.h
      sql/derror.cc
      sql/des_key_file.cc
      sql/discover.cc
      sql/event_data_objects.cc
      sql/event_data_objects.h
      sql/event_db_repository.cc
      sql/event_parse_data.cc
      sql/event_parse_data.h
      sql/event_queue.cc
      sql/event_queue.h
      sql/event_scheduler.cc
      sql/event_scheduler.h
      sql/events.cc
      sql/events.h
      sql/field.cc
      sql/field.h
      sql/field_conv.cc
      sql/filesort.cc
      sql/frm_crypt.cc
      sql/gstream.cc
      sql/gstream.h
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_binlog.h
      sql/ha_ndbcluster_cond.cc
      sql/ha_ndbcluster_cond.h
      sql/ha_partition.cc
      sql/ha_partition.h
      sql/handler.cc
      sql/handler.h
      sql/hash_filo.cc
      sql/hash_filo.h
      sql/hostname.cc
      sql/init.cc
      sql/item.cc
      sql/item.h
      sql/item_buff.cc
      sql/item_cmpfunc.cc
      sql/item_cmpfunc.h
      sql/item_create.cc
      sql/item_create.h
      sql/item_func.cc
      sql/item_func.h
      sql/item_geofunc.cc
      sql/item_row.cc
      sql/item_row.h
      sql/item_strfunc.cc
      sql/item_strfunc.h
      sql/item_subselect.cc
      sql/item_subselect.h
      sql/item_sum.cc
      sql/item_sum.h
      sql/item_timefunc.cc
      sql/item_timefunc.h
      sql/item_xmlfunc.cc
      sql/key.cc
      sql/keycaches.h
      sql/lock.cc
      sql/log.cc
      sql/log.h
      sql/log_event.cc
      sql/log_event.h
      sql/log_event_old.cc
      sql/mf_iocache.cc
      sql/my_decimal.cc
      sql/my_decimal.h
      sql/mysqld.cc
      sql/net_serv.cc
      sql/opt_range.cc
      sql/opt_range.h
      sql/opt_sum.cc
      sql/parse_file.cc
      sql/parse_file.h
      sql/partition_element.h
      sql/partition_info.cc
      sql/password.c
      sql/procedure.cc
      sql/procedure.h
      sql/protocol.cc
      sql/protocol.h
      sql/records.cc
      sql/repl_failsafe.cc
      sql/replication.h
      sql/rpl_filter.cc
      sql/rpl_filter.h
      sql/rpl_handler.cc
      sql/rpl_handler.h
      sql/rpl_injector.cc
      sql/rpl_injector.h
      sql/rpl_mi.cc
      sql/rpl_mi.h
      sql/rpl_record.cc
      sql/rpl_record.h
      sql/rpl_record_old.cc
      sql/rpl_record_old.h
      sql/rpl_reporting.cc
      sql/rpl_reporting.h
      sql/rpl_rli.cc
      sql/rpl_rli.h
      sql/rpl_tblmap.cc
      sql/rpl_tblmap.h
      sql/rpl_utility.cc
      sql/rpl_utility.h
      sql/scheduler.cc
      sql/set_var.cc
      sql/set_var.h
      sql/share/Makefile.am
      sql/slave.cc
      sql/slave.h
      sql/sp.cc
      sql/sp.h
      sql/sp_cache.cc
      sql/sp_cache.h
      sql/sp_head.cc
      sql/sp_head.h
      sql/sp_pcontext.cc
      sql/sp_pcontext.h
      sql/sp_rcontext.cc
      sql/sp_rcontext.h
      sql/spatial.cc
      sql/spatial.h
      sql/sql_acl.cc
      sql/sql_acl.h
      sql/sql_analyse.cc
      sql/sql_analyse.h
      sql/sql_audit.cc
      sql/sql_audit.h
      sql/sql_base.cc
      sql/sql_binlog.cc
      sql/sql_bitmap.h
      sql/sql_cache.cc
      sql/sql_cache.h
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_client.cc
      sql/sql_connect.cc
      sql/sql_crypt.cc
      sql/sql_crypt.h
      sql/sql_cursor.cc
      sql/sql_cursor.h
      sql/sql_db.cc
      sql/sql_delete.cc
      sql/sql_derived.cc
      sql/sql_do.cc
      sql/sql_error.cc
      sql/sql_error.h
      sql/sql_handler.cc
      sql/sql_help.cc
      sql/sql_insert.cc
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_list.cc
      sql/sql_list.h
      sql/sql_load.cc
      sql/sql_locale.cc
      sql/sql_manager.cc
      sql/sql_map.cc
      sql/sql_map.h
      sql/sql_olap.cc
      sql/sql_parse.cc
      sql/sql_partition.cc
      sql/sql_partition.h
      sql/sql_plugin.cc
      sql/sql_plugin.h
      sql/sql_prepare.cc
      sql/sql_profile.cc
      sql/sql_profile.h
      sql/sql_rename.cc
      sql/sql_repl.cc
      sql/sql_repl.h
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_servers.cc
      sql/sql_servers.h
      sql/sql_show.cc
      sql/sql_show.h
      sql/sql_signal.cc
      sql/sql_sort.h
      sql/sql_string.h
      sql/sql_table.cc
      sql/sql_tablespace.cc
      sql/sql_test.cc
      sql/sql_trigger.cc
      sql/sql_trigger.h
      sql/sql_udf.cc
      sql/sql_union.cc
      sql/sql_update.cc
      sql/sql_view.cc
      sql/sql_view.h
      sql/sql_yacc.yy
      sql/strfunc.cc
      sql/structs.h
      sql/sys_vars.cc
      sql/sys_vars.h
      sql/sys_vars_shared.h
      sql/table.cc
      sql/table.h
      sql/thr_malloc.cc
      sql/transaction.cc
      sql/tztime.cc
      sql/tztime.h
      sql/uniques.cc
      sql/unireg.cc
      sql/unireg.h
      storage/archive/ha_archive.cc
      storage/blackhole/ha_blackhole.cc
      storage/blackhole/ha_blackhole.h
      storage/csv/ha_tina.cc
      storage/csv/transparent_file.cc
      storage/example/ha_example.cc
      storage/example/ha_example.h
      storage/federated/ha_federated.cc
      storage/federated/ha_federated.h
      storage/heap/ha_heap.cc
      storage/heap/ha_heap.h
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/handler0alter.cc
      storage/innobase/handler/i_s.cc
      storage/innobase/handler/mysql_addons.cc
      storage/myisam/ha_myisam.cc
      storage/myisam/ha_myisam.h
      storage/myisam/rt_index.c
      storage/myisam/sort.c
      storage/myisammrg/ha_myisammrg.cc
      storage/myisammrg/myrg_open.c
      storage/ndb/src/common/util/Makefile.am
      storage/perfschema/ha_perfschema.cc
      storage/perfschema/ha_perfschema.h
      storage/perfschema/pfs.h
      storage/perfschema/pfs_check.cc
      storage/perfschema/pfs_column_values.cc
      storage/perfschema/pfs_column_values.h
      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_instr_class.h
      storage/perfschema/pfs_server.cc
      storage/perfschema/table_all_instr.cc
      storage/perfschema/table_events_waits.cc
      storage/perfschema/table_events_waits_summary.cc
      storage/perfschema/table_file_instances.cc
      storage/perfschema/table_file_summary.cc
      storage/perfschema/table_performance_timers.cc
      storage/perfschema/table_processlist.cc
      storage/perfschema/table_setup_consumers.cc
      storage/perfschema/table_setup_instruments.cc
      storage/perfschema/table_setup_objects.cc
      storage/perfschema/table_setup_timers.cc
      storage/perfschema/table_sync_instances.cc
      storage/perfschema/unittest/pfs-t.cc
      storage/perfschema/unittest/pfs_instr-oom-t.cc
      storage/perfschema/unittest/pfs_instr-t.cc
      storage/perfschema/unittest/pfs_instr_class-oom-t.cc
      storage/perfschema/unittest/pfs_instr_class-t.cc
      storage/perfschema/unittest/pfs_timer-t.cc
      sql/sql_priv.h
      sql/sql_time.cc
=== modified file 'storage/perfschema/pfs_global.h'
--- a/storage/perfschema/pfs_global.h	2010-01-12 01:47:27 +0000
+++ b/storage/perfschema/pfs_global.h	2010-04-01 14:26:53 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -30,27 +30,49 @@ void pfs_free(void *ptr);
 
 inline uint randomized_index(const void *ptr, uint max_size)
 {
+  static uint seed1= 0;
+  static uint seed2= 0;
+  uint result;
+  register intptr value;
+
   if (unlikely(max_size == 0))
     return 0;
 
   /*
-    ptr is typically an aligned structure,
-    so the last bits are not really random, but this has no effect.
-    Apply a factor A*x to spread
-    close values of ptr further apart (which helps with arrays),
-    and to spread values way beyond a typical max_size.
-    Then, apply a modulo to end within [0, max_size - 1].
-    A is big prime numbers, to avoid resonating with max_size,
-    to have a uniform distribution in [0, max_size - 1].
-    The value of A is chosen so that index(ptr) and index(ptr + N) (for arrays)
-    are likely to be not similar for typical values of max_size
-    (50, 100, 1000, etc).
-    In other words, (sizeof(T)*A % max_size) should not be a small number,
-    to avoid that with 'T array[max_size]', index(array[i])
-    and index(array[i + 1]) end up pointing in the same area in [0, max_size - 1].
+    ptr is typically an aligned structure, and can be in an array.
+    - The last bits are not random because of alignment,
+      so we divide by 8.
+    - The high bits are mostly constant, especially with 64 bits architectures,
+      but we keep most of them anyway, by doing computation in intptr.
+      The high bits are significant depending on where the data is
+      stored (the data segment, the stack, the heap, ...).
+    - To spread consecutive cells in an array further, we multiply by
+      a factor A. This factor should not be too high, which would cause
+      an overflow and cause loss of randomness (droping the top high bits).
+      The factor is a prime number, to help spread the distribution.
+    - To add more noise, and to be more robust if the calling code is
+      passing a constant value instead of a random identity,
+      we add the previous results, for hysteresys, with a degree 2 polynom,
+      X^2 + X + 1.
+    - Last, a modulo is applied to be within the [0, max_size - 1] range.
+    Note that seed1 and seed2 are static, and are *not* thread safe,
+    which is even better.
+    Effect with arrays: T array[N]
+    - ptr(i) = & array[i] = & array[0] + i * sizeof(T)
+    - ptr(i+1) = ptr(i) + sizeof(T).
+    What we want here, is to have index(i) and index(i+1) fall into
+    very different areas in [0, max_size - 1], to avoid locality.
   */
-  return static_cast<uint>
-    (((reinterpret_cast<intptr> (ptr)) * 2166179) % max_size);
+  value= (reinterpret_cast<intptr> (ptr)) >> 3;
+  value*= 1789;
+  value+= seed2 + seed1 + 1;
+  value%= max_size;
+  
+  result= static_cast<uint> (value);
+  seed2= seed1*seed1;
+  seed1= result;
+
+  return result;
 }
 
 void pfs_print_error(const char *format, ...);

=== modified file 'storage/perfschema/pfs_instr.cc'
--- a/storage/perfschema/pfs_instr.cc	2010-04-06 13:25:38 +0000
+++ b/storage/perfschema/pfs_instr.cc	2010-04-13 09:49:50 +0000
@@ -448,6 +448,75 @@ void cleanup_file_hash(void)
   }
 }
 
+void PFS_scan::init(uint random, uint max_size)
+{
+  m_pass= 0;
+
+  if (max_size == 0)
+  {
+    /* Degenerated case, no buffer */
+    m_pass_max= 0;
+    return;
+  }
+
+  DBUG_ASSERT(random < max_size);
+
+  if (PFS_MAX_ALLOC_RETRY < max_size)
+  {
+    /*
+      The buffer is big compared to PFS_MAX_ALLOC_RETRY,
+      scan it only partially.
+    */
+    if (random + PFS_MAX_ALLOC_RETRY < max_size)
+    {
+      /*
+        Pass 1: [random, random + PFS_MAX_ALLOC_RETRY - 1]
+        Pass 2: not used.
+      */
+      m_pass_max= 1;
+      m_first[0]= random;
+      m_last[0]= random + PFS_MAX_ALLOC_RETRY;
+      m_first[1]= 0;
+      m_last[1]= 0;
+    }
+    else
+    {
+      /*
+        Pass 1: [random, max_size - 1]
+        Pass 2: [0, ...]
+        The combined length of pass 1 and 2 is PFS_MAX_ALLOC_RETRY.
+      */
+      m_pass_max= 2;
+      m_first[0]= random;
+      m_last[0]= max_size;
+      m_first[1]= 0;
+      m_last[1]= PFS_MAX_ALLOC_RETRY - (max_size - random);
+    }
+  }
+  else
+  {
+    /*
+      The buffer is small compared to PFS_MAX_ALLOC_RETRY,
+      scan it in full in two passes.
+      Pass 1: [random, max_size - 1]
+      Pass 2: [0, random - 1]
+    */
+    m_pass_max= 2;
+    m_first[0]= random;
+    m_last[0]= max_size;
+    m_first[1]= 0;
+    m_last[1]= random;
+  }
+
+  DBUG_ASSERT(m_first[0] < max_size);
+  DBUG_ASSERT(m_first[1] < max_size);
+  DBUG_ASSERT(m_last[1] <= max_size);
+  DBUG_ASSERT(m_last[1] <= max_size);
+  /* The combined length of all passes should not exceed PFS_MAX_ALLOC_RETRY. */
+  DBUG_ASSERT((m_last[0] - m_first[0]) +
+              (m_last[1] - m_first[1]) <= PFS_MAX_ALLOC_RETRY);
+}
+
 /**
   Create instrumentation for a mutex instance.
   @param klass                        the mutex class
@@ -456,17 +525,15 @@ void cleanup_file_hash(void)
 */
 PFS_mutex* create_mutex(PFS_mutex_class *klass, const void *identity)
 {
-  int pass;
-  uint i= randomized_index(identity, mutex_max);
+  PFS_scan scan;
+  uint random= randomized_index(identity, mutex_max);
 
-  /*
-    Pass 1: [random, mutex_max - 1]
-    Pass 2: [0, mutex_max - 1]
-  */
-  for (pass= 1; pass <= 2; i=0, pass++)
+  for (scan.init(random, mutex_max);
+       scan.has_pass();
+       scan.next_pass())
   {
-    PFS_mutex *pfs= mutex_array + i;
-    PFS_mutex *pfs_last= mutex_array + mutex_max;
+    PFS_mutex *pfs= mutex_array + scan.first();
+    PFS_mutex *pfs_last= mutex_array + scan.last();
     for ( ; pfs < pfs_last; pfs++)
     {
       if (pfs->m_lock.is_free())
@@ -514,17 +581,15 @@ void destroy_mutex(PFS_mutex *pfs)
 */
 PFS_rwlock* create_rwlock(PFS_rwlock_class *klass, const void *identity)
 {
-  int pass;
-  uint i= randomized_index(identity, rwlock_max);
+  PFS_scan scan;
+  uint random= randomized_index(identity, rwlock_max);
 
-  /*
-    Pass 1: [random, rwlock_max - 1]
-    Pass 2: [0, rwlock_max - 1]
-  */
-  for (pass= 1; pass <= 2; i=0, pass++)
+  for (scan.init(random, rwlock_max);
+       scan.has_pass();
+       scan.next_pass())
   {
-    PFS_rwlock *pfs= rwlock_array + i;
-    PFS_rwlock *pfs_last= rwlock_array + rwlock_max;
+    PFS_rwlock *pfs= rwlock_array + scan.first();
+    PFS_rwlock *pfs_last= rwlock_array + scan.last();
     for ( ; pfs < pfs_last; pfs++)
     {
       if (pfs->m_lock.is_free())
@@ -578,17 +643,15 @@ void destroy_rwlock(PFS_rwlock *pfs)
 */
 PFS_cond* create_cond(PFS_cond_class *klass, const void *identity)
 {
-  int pass;
-  uint i= randomized_index(identity, cond_max);
+  PFS_scan scan;
+  uint random= randomized_index(identity, cond_max);
 
-  /*
-    Pass 1: [random, cond_max - 1]
-    Pass 2: [0, cond_max - 1]
-  */
-  for (pass= 1; pass <= 2; i=0, pass++)
+  for (scan.init(random, cond_max);
+       scan.has_pass();
+       scan.next_pass())
   {
-    PFS_cond *pfs= cond_array + i;
-    PFS_cond *pfs_last= cond_array + cond_max;
+    PFS_cond *pfs= cond_array + scan.first();
+    PFS_cond *pfs_last= cond_array + scan.last();
     for ( ; pfs < pfs_last; pfs++)
     {
       if (pfs->m_lock.is_free())
@@ -636,17 +699,15 @@ void destroy_cond(PFS_cond *pfs)
 PFS_thread* create_thread(PFS_thread_class *klass, const void *identity,
                           ulong thread_id)
 {
-  int pass;
-  uint i= randomized_index(identity, thread_max);
+  PFS_scan scan;
+  uint random= randomized_index(identity, thread_max);
 
-  /*
-    Pass 1: [random, thread_max - 1]
-    Pass 2: [0, thread_max - 1]
-  */
-  for (pass= 1; pass <= 2; i=0, pass++)
+  for (scan.init(random, thread_max);
+       scan.has_pass();
+       scan.next_pass())
   {
-    PFS_thread *pfs= thread_array + i;
-    PFS_thread *pfs_last= thread_array + thread_max;
+    PFS_thread *pfs= thread_array + scan.first();
+    PFS_thread *pfs_last= thread_array + scan.last();
     for ( ; pfs < pfs_last; pfs++)
     {
       if (pfs->m_lock.is_free())
@@ -730,7 +791,7 @@ find_or_create_file(PFS_thread *thread, 
                     const char *filename, uint len)
 {
   PFS_file *pfs;
-  int pass;
+  PFS_scan scan;
 
   if (! filename_hash_inited)
   {
@@ -842,17 +903,14 @@ search:
   }
 
   /* filename is not constant, just using it for noise on create */
-  uint i= randomized_index(filename, file_max);
+  uint random= randomized_index(filename, file_max);
 
-  /*
-    Pass 1: [random, file_max - 1]
-    Pass 2: [0, file_max - 1]
-  */
-  for (pass= 1; pass <= 2; i=0, pass++)
+  for (scan.init(random, file_max);
+       scan.has_pass();
+       scan.next_pass())
   {
-    pfs= file_array + i;
-    PFS_file *pfs_last= file_array + file_max;
-
+    pfs= file_array + scan.first();
+    PFS_file *pfs_last= file_array + scan.last();
     for ( ; pfs < pfs_last; pfs++)
     {
       if (pfs->m_lock.is_free())
@@ -937,17 +995,15 @@ void destroy_file(PFS_thread *thread, PF
 */
 PFS_table* create_table(PFS_table_share *share, const void *identity)
 {
-  int pass;
-  uint i= randomized_index(identity, table_max);
+  PFS_scan scan;
+  uint random= randomized_index(identity, table_max);
 
-  /*
-    Pass 1: [random, table_max - 1]
-    Pass 2: [0, table_max - 1]
-  */
-  for (pass= 1; pass <= 2; i=0, pass++)
+  for (scan.init(random, table_max);
+       scan.has_pass();
+       scan.next_pass())
   {
-    PFS_table *pfs= table_array + i;
-    PFS_table *pfs_last= table_array + table_max;
+    PFS_table *pfs= table_array + scan.first();
+    PFS_table *pfs_last= table_array + scan.last();
     for ( ; pfs < pfs_last; pfs++)
     {
       if (pfs->m_lock.is_free())

=== modified file 'storage/perfschema/pfs_instr.h'
--- a/storage/perfschema/pfs_instr.h	2010-03-31 14:05:33 +0000
+++ b/storage/perfschema/pfs_instr.h	2010-04-13 09:49:50 +0000
@@ -136,6 +136,48 @@ struct PFS_table : public PFS_instr
 */
 #define LOCKER_STACK_SIZE 3
 
+/**
+  @def PFS_MAX_ALLOC_RETRY
+  Maximum number of times the code attempts to allocate an item
+  from internal buffers, before giving up.
+*/
+#define PFS_MAX_ALLOC_RETRY 1000
+
+#define PFS_MAX_SCAN_PASS 2
+
+/**
+  Helper to scan circular buffers.
+  Given a buffer of size [0, max_size - 1],
+  and a random starting point in the buffer,
+  this helper returns up to two [first, last -1] intervals that:
+  - fit into the [0, max_size - 1] range,
+  - have a maximum combined length of at most PFS_MAX_ALLOC_RETRY.
+*/
+struct PFS_scan
+{
+public:
+  void init(uint random, uint max_size);
+
+  bool has_pass() const
+  { return (m_pass < m_pass_max); }
+
+  void next_pass()
+  { m_pass++; }
+  
+  uint first() const
+  { return m_first[m_pass]; }
+
+  uint last() const
+  { return m_last[m_pass]; }
+
+private:
+  uint m_pass;
+  uint m_pass_max;
+  uint m_first[PFS_MAX_SCAN_PASS];
+  uint m_last[PFS_MAX_SCAN_PASS];
+};
+
+
 /** Instrumented thread implementation. @see PSI_thread. */
 struct PFS_thread
 {


Attachment: [text/bzr-bundle] bzr/marc.alff@oracle.com-20100413094950-y06t48iz8ydozjco.bundle
Thread
bzr push into mysql-next-mr-bugfixing branch (marc.alff:3145)Marc Alff13 Apr