List:Commits« Previous MessageNext Message »
From:Daniel Fischer Date:October 20 2008 8:11pm
Subject:bzr push into mysql-5.1 branch (df:2707 to 2708)
View as plain text  
 2708 Daniel Fischer	2008-10-20
      merge fix
modified:
  Makefile.am

 2707 Daniel Fischer	2008-10-20 [merge]
      merge from mysql-5.1 main
removed:
  extra/yassl/taocrypt/taocrypt.vcproj
  extra/yassl/yassl.vcproj
  include/mysql_h.ic
  mysql-test/include/binlog_cache_size_basic.inc
  mysql-test/include/bulk_insert_buffer_size_basic.inc
  mysql-test/include/delayed_insert_limit_basic.inc
  mysql-test/include/delayed_queue_size_basic.inc
  mysql-test/include/innodb_concurrency_tickets_basic.inc
  mysql-test/include/innodb_max_purge_lag_basic.inc
  mysql-test/include/innodb_sync_spin_loops_basic.inc
  mysql-test/include/join_buffer_size_basic.inc
  mysql-test/include/key_buffer_size_basic.inc
  mysql-test/include/key_cache_age_threshold_basic.inc
  mysql-test/include/key_cache_block_size_basic.inc
  mysql-test/include/key_cache_division_limit_basic.inc
  mysql-test/include/log_warnings_basic.inc
  mysql-test/include/max_binlog_cache_size_basic.inc
  mysql-test/include/max_connect_errors_basic.inc
  mysql-test/include/max_heap_table_size_basic.inc
  mysql-test/include/max_seeks_for_key_basic.inc
  mysql-test/include/max_tmp_tables_basic.inc
  mysql-test/include/max_write_lock_count_basic.inc
  mysql-test/include/min_examined_row_limit_basic.inc
  mysql-test/include/multi_range_count_basic.inc
  mysql-test/include/myisam_max_sort_file_size_basic.inc
  mysql-test/include/myisam_repair_threads_basic.inc
  mysql-test/include/myisam_sort_buffer_size_basic.inc
  mysql-test/include/net_retry_count_basic.inc
  mysql-test/include/query_alloc_block_size_basic.inc
  mysql-test/include/query_cache_limit_basic.inc
  mysql-test/include/query_cache_min_res_unit_basic.inc
  mysql-test/include/query_cache_size_basic.inc
  mysql-test/include/query_prealloc_size_basic.inc
  mysql-test/include/range_alloc_block_size_basic.inc
  mysql-test/include/rpl_recovery_rank_basic.inc
  mysql-test/include/server_id_basic.inc
  mysql-test/include/slave_transaction_retries_basic.inc
  mysql-test/include/sort_buffer_size_basic.inc
  mysql-test/include/sync_binlog_basic.inc
  mysql-test/include/timestamp_basic.inc
  mysql-test/include/tmp_table_size_basic.inc
  mysql-test/include/transaction_alloc_block_size_basic.inc
  mysql-test/include/transaction_prealloc_size_basic.inc
  mysql-test/include/wait_timeout_basic.inc
  mysql-test/r/binlog_cache_size_basic_32.result
  mysql-test/r/binlog_cache_size_basic_64.result
  mysql-test/r/bulk_insert_buffer_size_basic_32.result
  mysql-test/r/bulk_insert_buffer_size_basic_64.result
  mysql-test/r/concurrent_innodb.result
  mysql-test/r/delayed_insert_limit_basic_32.result
  mysql-test/r/delayed_insert_limit_basic_64.result
  mysql-test/r/delayed_queue_size_basic_32.result
  mysql-test/r/delayed_queue_size_basic_64.result
  mysql-test/r/innodb_concurrency_tickets_basic_32.result
  mysql-test/r/innodb_concurrency_tickets_basic_64.result
  mysql-test/r/innodb_max_purge_lag_basic_32.result
  mysql-test/r/innodb_max_purge_lag_basic_64.result
  mysql-test/r/innodb_sync_spin_loops_basic_32.result
  mysql-test/r/innodb_sync_spin_loops_basic_64.result
  mysql-test/r/join_buffer_size_basic_32.result
  mysql-test/r/join_buffer_size_basic_64.result
  mysql-test/r/key_buffer_size_basic_32.result
  mysql-test/r/key_buffer_size_basic_64.result
  mysql-test/r/key_cache_age_threshold_basic_32.result
  mysql-test/r/key_cache_age_threshold_basic_64.result
  mysql-test/r/key_cache_block_size_basic_32.result
  mysql-test/r/key_cache_block_size_basic_64.result
  mysql-test/r/key_cache_division_limit_basic_32.result
  mysql-test/r/key_cache_division_limit_basic_64.result
  mysql-test/r/log_warnings_basic_32.result
  mysql-test/r/log_warnings_basic_64.result
  mysql-test/r/max_binlog_cache_size_basic_32.result
  mysql-test/r/max_binlog_cache_size_basic_64.result
  mysql-test/r/max_connect_errors_basic_32.result
  mysql-test/r/max_connect_errors_basic_64.result
  mysql-test/r/max_heap_table_size_basic_32.result
  mysql-test/r/max_heap_table_size_basic_64.result
  mysql-test/r/max_seeks_for_key_basic_32.result
  mysql-test/r/max_seeks_for_key_basic_64.result
  mysql-test/r/max_tmp_tables_basic_32.result
  mysql-test/r/max_tmp_tables_basic_64.result
  mysql-test/r/max_write_lock_count_basic_32.result
  mysql-test/r/max_write_lock_count_basic_64.result
  mysql-test/r/min_examined_row_limit_basic_32.result
  mysql-test/r/min_examined_row_limit_basic_64.result
  mysql-test/r/multi_range_count_basic_32.result
  mysql-test/r/multi_range_count_basic_64.result
  mysql-test/r/myisam_max_sort_file_size_basic_32.result
  mysql-test/r/myisam_max_sort_file_size_basic_64.result
  mysql-test/r/myisam_repair_threads_basic_32.result
  mysql-test/r/myisam_repair_threads_basic_64.result
  mysql-test/r/myisam_sort_buffer_size_basic_32.result
  mysql-test/r/myisam_sort_buffer_size_basic_64.result
  mysql-test/r/net_retry_count_basic_32.result
  mysql-test/r/net_retry_count_basic_64.result
  mysql-test/r/query_alloc_block_size_basic_32.result
  mysql-test/r/query_alloc_block_size_basic_64.result
  mysql-test/r/query_cache_limit_basic_32.result
  mysql-test/r/query_cache_limit_basic_64.result
  mysql-test/r/query_cache_min_res_unit_basic_32.result
  mysql-test/r/query_cache_min_res_unit_basic_64.result
  mysql-test/r/query_cache_size_basic_32.result
  mysql-test/r/query_cache_size_basic_64.result
  mysql-test/r/query_prealloc_size_basic_32.result
  mysql-test/r/query_prealloc_size_basic_64.result
  mysql-test/r/range_alloc_block_size_basic_32.result
  mysql-test/r/range_alloc_block_size_basic_64.result
  mysql-test/r/rpl_recovery_rank_basic_32.result
  mysql-test/r/rpl_recovery_rank_basic_64.result
  mysql-test/r/server_id_basic_32.result
  mysql-test/r/server_id_basic_64.result
  mysql-test/r/slave_transaction_retries_basic_32.result
  mysql-test/r/slave_transaction_retries_basic_64.result
  mysql-test/r/sort_buffer_size_basic_32.result
  mysql-test/r/sort_buffer_size_basic_64.result
  mysql-test/r/sync_binlog_basic_32.result
  mysql-test/r/sync_binlog_basic_64.result
  mysql-test/r/timestamp_basic_32.result
  mysql-test/r/timestamp_basic_64.result
  mysql-test/r/tmp_table_size_basic_32.result
  mysql-test/r/tmp_table_size_basic_64.result
  mysql-test/r/transaction_alloc_block_size_basic_32.result
  mysql-test/r/transaction_alloc_block_size_basic_64.result
  mysql-test/r/transaction_prealloc_size_basic_32.result
  mysql-test/r/transaction_prealloc_size_basic_64.result
  mysql-test/r/wait_timeout_basic_32.result
  mysql-test/r/wait_timeout_basic_64.result
  mysql-test/suite/funcs_1/r/memory_storedproc.result
  mysql-test/suite/funcs_1/r/myisam_storedproc.result
  mysql-test/suite/funcs_1/r/ndb_storedproc.result
  mysql-test/suite/funcs_1/t/innodb_storedproc.test
  mysql-test/suite/funcs_1/t/memory_storedproc.test
  mysql-test/suite/funcs_1/t/myisam_storedproc.test
  mysql-test/suite/funcs_1/t/ndb_storedproc.test
  mysql-test/suite/parts/t/partition_alter2_ndb.test
  mysql-test/suite/rpl/t/rpl_view-slave.opt
  mysql-test/t/binlog_cache_size_basic_32.test
  mysql-test/t/binlog_cache_size_basic_64.test
  mysql-test/t/bulk_insert_buffer_size_basic_32.test
  mysql-test/t/bulk_insert_buffer_size_basic_64.test
  mysql-test/t/concurrent_innodb-master.opt
  mysql-test/t/concurrent_innodb.test
  mysql-test/t/delayed_insert_limit_basic_32.test
  mysql-test/t/delayed_insert_limit_basic_64.test
  mysql-test/t/delayed_queue_size_basic_32.test
  mysql-test/t/delayed_queue_size_basic_64.test
  mysql-test/t/innodb_concurrency_tickets_basic_32.test
  mysql-test/t/innodb_concurrency_tickets_basic_64.test
  mysql-test/t/innodb_max_purge_lag_basic_32.test
  mysql-test/t/innodb_max_purge_lag_basic_64.test
  mysql-test/t/innodb_sync_spin_loops_basic_32.test
  mysql-test/t/innodb_sync_spin_loops_basic_64.test
  mysql-test/t/join_buffer_size_basic_32.test
  mysql-test/t/join_buffer_size_basic_64.test
  mysql-test/t/key_buffer_size_basic_32.test
  mysql-test/t/key_buffer_size_basic_64.test
  mysql-test/t/key_cache_age_threshold_basic_32.test
  mysql-test/t/key_cache_age_threshold_basic_64.test
  mysql-test/t/key_cache_block_size_basic_32.test
  mysql-test/t/key_cache_block_size_basic_64.test
  mysql-test/t/key_cache_division_limit_basic_32.test
  mysql-test/t/key_cache_division_limit_basic_64.test
  mysql-test/t/log_warnings_basic_32.test
  mysql-test/t/log_warnings_basic_64.test
  mysql-test/t/max_binlog_cache_size_basic_32.test
  mysql-test/t/max_binlog_cache_size_basic_64.test
  mysql-test/t/max_connect_errors_basic_32.test
  mysql-test/t/max_connect_errors_basic_64.test
  mysql-test/t/max_heap_table_size_basic_32.test
  mysql-test/t/max_heap_table_size_basic_64.test
  mysql-test/t/max_seeks_for_key_basic_32.test
  mysql-test/t/max_seeks_for_key_basic_64.test
  mysql-test/t/max_tmp_tables_basic_32.test
  mysql-test/t/max_tmp_tables_basic_64.test
  mysql-test/t/max_write_lock_count_basic_32.test
  mysql-test/t/max_write_lock_count_basic_64.test
  mysql-test/t/min_examined_row_limit_basic_32.test
  mysql-test/t/min_examined_row_limit_basic_64.test
  mysql-test/t/multi_range_count_basic_32.test
  mysql-test/t/multi_range_count_basic_64.test
  mysql-test/t/myisam_max_sort_file_size_basic_32.test
  mysql-test/t/myisam_max_sort_file_size_basic_64.test
  mysql-test/t/myisam_repair_threads_basic_32.test
  mysql-test/t/myisam_repair_threads_basic_64.test
  mysql-test/t/myisam_sort_buffer_size_basic_32.test
  mysql-test/t/myisam_sort_buffer_size_basic_64.test
  mysql-test/t/net_retry_count_basic_32.test
  mysql-test/t/net_retry_count_basic_64.test
  mysql-test/t/query_alloc_block_size_basic_32.test
  mysql-test/t/query_alloc_block_size_basic_64.test
  mysql-test/t/query_cache_limit_basic_32.test
  mysql-test/t/query_cache_limit_basic_64.test
  mysql-test/t/query_cache_min_res_unit_basic_32.test
  mysql-test/t/query_cache_min_res_unit_basic_64.test
  mysql-test/t/query_cache_size_basic_32.test
  mysql-test/t/query_cache_size_basic_64.test
  mysql-test/t/query_prealloc_size_basic_32.test
  mysql-test/t/query_prealloc_size_basic_64.test
  mysql-test/t/range_alloc_block_size_basic_32.test
  mysql-test/t/range_alloc_block_size_basic_64.test
  mysql-test/t/rpl_recovery_rank_basic_32.test
  mysql-test/t/rpl_recovery_rank_basic_64.test
  mysql-test/t/server_id_basic_32.test
  mysql-test/t/server_id_basic_64.test
  mysql-test/t/slave_transaction_retries_basic_32.test
  mysql-test/t/slave_transaction_retries_basic_64.test
  mysql-test/t/sort_buffer_size_basic_32.test
  mysql-test/t/sort_buffer_size_basic_64.test
  mysql-test/t/sync_binlog_basic_32.test
  mysql-test/t/sync_binlog_basic_64.test
  mysql-test/t/timestamp_basic_32.test
  mysql-test/t/timestamp_basic_64.test
  mysql-test/t/tmp_table_size_basic_32.test
  mysql-test/t/tmp_table_size_basic_64.test
  mysql-test/t/transaction_alloc_block_size_basic_32.test
  mysql-test/t/transaction_alloc_block_size_basic_64.test
  mysql-test/t/transaction_prealloc_size_basic_32.test
  mysql-test/t/transaction_prealloc_size_basic_64.test
  mysql-test/t/wait_timeout_basic_32.test
  mysql-test/t/wait_timeout_basic_64.test
  server-tools/instance-manager/mysqlmanager.vcproj
added:
  include/mysql.h.pp
  include/mysql/plugin.h.pp
  mysql-test/extra/rpl_tests/rpl_blackhole.test
  mysql-test/include/have_case_insensitive_file_system.inc
  mysql-test/include/have_lowercase2.inc
  mysql-test/include/mysqlbinlog_row_engine.inc
  mysql-test/include/ps_ddl_1.inc
  mysql-test/include/wait_for_slave_sql_error_and_skip.inc
  mysql-test/r/case_insensitive_file_system.require
  mysql-test/r/concurrent_innodb_safelog.result
  mysql-test/r/concurrent_innodb_unsafelog.result
  mysql-test/r/innodb-autoinc-optimize.result
  mysql-test/r/innodb-autoinc.result
  mysql-test/r/innodb_bug34300.result
  mysql-test/r/innodb_bug35220.result
  mysql-test/r/mysqlbinlog_row.result
  mysql-test/r/mysqlbinlog_row_big.result
  mysql-test/r/mysqlbinlog_row_innodb.result
  mysql-test/r/mysqlbinlog_row_myisam.result
  mysql-test/r/mysqlbinlog_row_trans.result
  mysql-test/r/parser_stack.result
  mysql-test/r/skip_log_bin.result
  mysql-test/std_data/corrupt_t1#P#p1.MYI
  mysql-test/std_data/corrupt_t1.MYI
  mysql-test/std_data/parts/t1_will_crash#P#p1_first_1024.MYD
  mysql-test/std_data/parts/t1_will_crash#P#p2.MYD
  mysql-test/std_data/parts/t1_will_crash#P#p2.MYI
  mysql-test/std_data/parts/t1_will_crash#P#p3.MYI
  mysql-test/std_data/parts/t1_will_crash#P#p4.MYI
  mysql-test/std_data/parts/t1_will_crash#P#p6.MYD
  mysql-test/std_data/parts/t1_will_crash#P#p6_2.MYD
  mysql-test/std_data/parts/t1_will_crash#P#p6_3.MYD
  mysql-test/suite/binlog/r/binlog_grant.result
  mysql-test/suite/binlog/r/binlog_mix_innodb_stat.result
  mysql-test/suite/binlog/r/binlog_stm_row.result
  mysql-test/suite/binlog/t/binlog_grant.test
  mysql-test/suite/binlog/t/binlog_mix_innodb_stat.test
  mysql-test/suite/binlog/t/binlog_stm_row.test
  mysql-test/suite/funcs_1/storedproc/param_check.inc
  mysql-test/suite/parts/inc/partition_alter2_2.inc
  mysql-test/suite/parts/inc/partition_auto_increment.inc
  mysql-test/suite/parts/inc/partition_mgm.inc
  mysql-test/suite/parts/r/partition_alter2_2_innodb.result
  mysql-test/suite/parts/r/partition_alter2_2_myisam.result
  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/parts/r/partition_mgm_lc0_archive.result
  mysql-test/suite/parts/r/partition_mgm_lc0_innodb.result
  mysql-test/suite/parts/r/partition_mgm_lc0_memory.result
  mysql-test/suite/parts/r/partition_mgm_lc0_myisam.result
  mysql-test/suite/parts/r/partition_mgm_lc0_ndb.result
  mysql-test/suite/parts/r/partition_mgm_lc1_archive.result
  mysql-test/suite/parts/r/partition_mgm_lc1_innodb.result
  mysql-test/suite/parts/r/partition_mgm_lc1_memory.result
  mysql-test/suite/parts/r/partition_mgm_lc1_myisam.result
  mysql-test/suite/parts/r/partition_mgm_lc1_ndb.result
  mysql-test/suite/parts/r/partition_mgm_lc2_archive.result
  mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result
  mysql-test/suite/parts/r/partition_mgm_lc2_memory.result
  mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result
  mysql-test/suite/parts/r/partition_mgm_lc2_ndb.result
  mysql-test/suite/parts/r/partition_recover_myisam.result
  mysql-test/suite/parts/r/partition_repair_myisam.result
  mysql-test/suite/parts/t/partition_alter2_2_innodb.test
  mysql-test/suite/parts/t/partition_alter2_2_myisam.test
  mysql-test/suite/parts/t/partition_auto_increment_archive.test
  mysql-test/suite/parts/t/partition_auto_increment_blackhole.test
  mysql-test/suite/parts/t/partition_auto_increment_innodb.test
  mysql-test/suite/parts/t/partition_auto_increment_memory.test
  mysql-test/suite/parts/t/partition_auto_increment_myisam.test
  mysql-test/suite/parts/t/partition_auto_increment_ndb.test
  mysql-test/suite/parts/t/partition_mgm_lc0_archive.test
  mysql-test/suite/parts/t/partition_mgm_lc0_innodb.test
  mysql-test/suite/parts/t/partition_mgm_lc0_memory.test
  mysql-test/suite/parts/t/partition_mgm_lc0_myisam.test
  mysql-test/suite/parts/t/partition_mgm_lc0_ndb.test
  mysql-test/suite/parts/t/partition_mgm_lc1_archive-master.opt
  mysql-test/suite/parts/t/partition_mgm_lc1_archive.test
  mysql-test/suite/parts/t/partition_mgm_lc1_innodb-master.opt
  mysql-test/suite/parts/t/partition_mgm_lc1_innodb.test
  mysql-test/suite/parts/t/partition_mgm_lc1_memory-master.opt
  mysql-test/suite/parts/t/partition_mgm_lc1_memory.test
  mysql-test/suite/parts/t/partition_mgm_lc1_myisam-master.opt
  mysql-test/suite/parts/t/partition_mgm_lc1_myisam.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_archive-master.opt
  mysql-test/suite/parts/t/partition_mgm_lc2_archive.test
  mysql-test/suite/parts/t/partition_mgm_lc2_innodb-master.opt
  mysql-test/suite/parts/t/partition_mgm_lc2_innodb.test
  mysql-test/suite/parts/t/partition_mgm_lc2_memory-master.opt
  mysql-test/suite/parts/t/partition_mgm_lc2_memory.test
  mysql-test/suite/parts/t/partition_mgm_lc2_myisam-master.opt
  mysql-test/suite/parts/t/partition_mgm_lc2_myisam.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_recover_myisam-master.opt
  mysql-test/suite/parts/t/partition_recover_myisam.test
  mysql-test/suite/parts/t/partition_repair_myisam.test
  mysql-test/suite/parts/t/partition_special_innodb-master.opt
  mysql-test/suite/rpl/r/rpl_binlog_query_filter_rules.result
  mysql-test/suite/rpl/r/rpl_blackhole.result
  mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result
  mysql-test/suite/rpl/r/rpl_plugin_load.result
  mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules-master.opt
  mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules.test
  mysql-test/suite/rpl/t/rpl_blackhole.test
  mysql-test/suite/rpl/t/rpl_filter_tables_not_exist-slave.opt
  mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test
  mysql-test/suite/rpl/t/rpl_plugin_load-master.opt
  mysql-test/suite/rpl/t/rpl_plugin_load-slave.opt
  mysql-test/suite/rpl/t/rpl_plugin_load.test
  mysql-test/suite/sys_vars/
  mysql-test/suite/sys_vars/README
  mysql-test/suite/sys_vars/inc/
  mysql-test/suite/sys_vars/inc/binlog_cache_size_basic.inc
  mysql-test/suite/sys_vars/inc/bulk_insert_buffer_size_basic.inc
  mysql-test/suite/sys_vars/inc/delayed_insert_limit_basic.inc
  mysql-test/suite/sys_vars/inc/delayed_queue_size_basic.inc
  mysql-test/suite/sys_vars/inc/innodb_concurrency_tickets_basic.inc
  mysql-test/suite/sys_vars/inc/innodb_max_purge_lag_basic.inc
  mysql-test/suite/sys_vars/inc/innodb_sync_spin_loops_basic.inc
  mysql-test/suite/sys_vars/inc/join_buffer_size_basic.inc
  mysql-test/suite/sys_vars/inc/key_buffer_size_basic.inc
  mysql-test/suite/sys_vars/inc/key_cache_age_threshold_basic.inc
  mysql-test/suite/sys_vars/inc/key_cache_block_size_basic.inc
  mysql-test/suite/sys_vars/inc/key_cache_division_limit_basic.inc
  mysql-test/suite/sys_vars/inc/log_warnings_basic.inc
  mysql-test/suite/sys_vars/inc/max_binlog_cache_size_basic.inc
  mysql-test/suite/sys_vars/inc/max_connect_errors_basic.inc
  mysql-test/suite/sys_vars/inc/max_heap_table_size_basic.inc
  mysql-test/suite/sys_vars/inc/max_seeks_for_key_basic.inc
  mysql-test/suite/sys_vars/inc/max_tmp_tables_basic.inc
  mysql-test/suite/sys_vars/inc/max_write_lock_count_basic.inc
  mysql-test/suite/sys_vars/inc/min_examined_row_limit_basic.inc
  mysql-test/suite/sys_vars/inc/multi_range_count_basic.inc
  mysql-test/suite/sys_vars/inc/myisam_max_sort_file_size_basic.inc
  mysql-test/suite/sys_vars/inc/myisam_repair_threads_basic.inc
  mysql-test/suite/sys_vars/inc/myisam_sort_buffer_size_basic.inc
  mysql-test/suite/sys_vars/inc/net_retry_count_basic.inc
  mysql-test/suite/sys_vars/inc/query_alloc_block_size_basic.inc
  mysql-test/suite/sys_vars/inc/query_cache_limit_basic.inc
  mysql-test/suite/sys_vars/inc/query_cache_min_res_unit_basic.inc
  mysql-test/suite/sys_vars/inc/query_cache_size_basic.inc
  mysql-test/suite/sys_vars/inc/query_prealloc_size_basic.inc
  mysql-test/suite/sys_vars/inc/range_alloc_block_size_basic.inc
  mysql-test/suite/sys_vars/inc/rpl_recovery_rank_basic.inc
  mysql-test/suite/sys_vars/inc/server_id_basic.inc
  mysql-test/suite/sys_vars/inc/slave_transaction_retries_basic.inc
  mysql-test/suite/sys_vars/inc/sort_buffer_size_basic.inc
  mysql-test/suite/sys_vars/inc/sync_binlog_basic.inc
  mysql-test/suite/sys_vars/inc/timestamp_basic.inc
  mysql-test/suite/sys_vars/inc/tmp_table_size_basic.inc
  mysql-test/suite/sys_vars/inc/transaction_alloc_block_size_basic.inc
  mysql-test/suite/sys_vars/inc/transaction_prealloc_size_basic.inc
  mysql-test/suite/sys_vars/inc/wait_timeout_basic.inc
  mysql-test/suite/sys_vars/r/
  mysql-test/suite/sys_vars/r/binlog_cache_size_basic_32.result
  mysql-test/suite/sys_vars/r/binlog_cache_size_basic_64.result
  mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_32.result
  mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_64.result
  mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_32.result
  mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result
  mysql-test/suite/sys_vars/r/delayed_queue_size_basic_32.result
  mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result
  mysql-test/suite/sys_vars/r/innodb_concurrency_tickets_basic_32.result
  mysql-test/suite/sys_vars/r/innodb_concurrency_tickets_basic_64.result
  mysql-test/suite/sys_vars/r/innodb_max_purge_lag_basic_32.result
  mysql-test/suite/sys_vars/r/innodb_max_purge_lag_basic_64.result
  mysql-test/suite/sys_vars/r/innodb_sync_spin_loops_basic_32.result
  mysql-test/suite/sys_vars/r/innodb_sync_spin_loops_basic_64.result
  mysql-test/suite/sys_vars/r/join_buffer_size_basic_32.result
  mysql-test/suite/sys_vars/r/join_buffer_size_basic_64.result
  mysql-test/suite/sys_vars/r/key_buffer_size_basic_32.result
  mysql-test/suite/sys_vars/r/key_buffer_size_basic_64.result
  mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_32.result
  mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_64.result
  mysql-test/suite/sys_vars/r/key_cache_block_size_basic_32.result
  mysql-test/suite/sys_vars/r/key_cache_block_size_basic_64.result
  mysql-test/suite/sys_vars/r/key_cache_division_limit_basic_32.result
  mysql-test/suite/sys_vars/r/key_cache_division_limit_basic_64.result
  mysql-test/suite/sys_vars/r/log_warnings_basic_32.result
  mysql-test/suite/sys_vars/r/log_warnings_basic_64.result
  mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_32.result
  mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_64.result
  mysql-test/suite/sys_vars/r/max_connect_errors_basic_32.result
  mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result
  mysql-test/suite/sys_vars/r/max_heap_table_size_basic_32.result
  mysql-test/suite/sys_vars/r/max_heap_table_size_basic_64.result
  mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_32.result
  mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_64.result
  mysql-test/suite/sys_vars/r/max_tmp_tables_basic_32.result
  mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result
  mysql-test/suite/sys_vars/r/max_write_lock_count_basic_32.result
  mysql-test/suite/sys_vars/r/max_write_lock_count_basic_64.result
  mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_32.result
  mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result
  mysql-test/suite/sys_vars/r/multi_range_count_basic_32.result
  mysql-test/suite/sys_vars/r/multi_range_count_basic_64.result
  mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_32.result
  mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_64.result
  mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_32.result
  mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_64.result
  mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_32.result
  mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_64.result
  mysql-test/suite/sys_vars/r/net_retry_count_basic_32.result
  mysql-test/suite/sys_vars/r/net_retry_count_basic_64.result
  mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result
  mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_64.result
  mysql-test/suite/sys_vars/r/query_cache_limit_basic_32.result
  mysql-test/suite/sys_vars/r/query_cache_limit_basic_64.result
  mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_32.result
  mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_64.result
  mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result
  mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result
  mysql-test/suite/sys_vars/r/query_prealloc_size_basic_32.result
  mysql-test/suite/sys_vars/r/query_prealloc_size_basic_64.result
  mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_32.result
  mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_64.result
  mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_32.result
  mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_64.result
  mysql-test/suite/sys_vars/r/server_id_basic_32.result
  mysql-test/suite/sys_vars/r/server_id_basic_64.result
  mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_32.result
  mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result
  mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result
  mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result
  mysql-test/suite/sys_vars/r/sync_binlog_basic_32.result
  mysql-test/suite/sys_vars/r/sync_binlog_basic_64.result
  mysql-test/suite/sys_vars/r/timestamp_basic_32.result
  mysql-test/suite/sys_vars/r/timestamp_basic_64.result
  mysql-test/suite/sys_vars/r/tmp_table_size_basic_32.result
  mysql-test/suite/sys_vars/r/tmp_table_size_basic_64.result
  mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result
  mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result
  mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_32.result
  mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result
  mysql-test/suite/sys_vars/r/wait_timeout_basic_32.result
  mysql-test/suite/sys_vars/r/wait_timeout_basic_64.result
  mysql-test/suite/sys_vars/t/
  mysql-test/suite/sys_vars/t/binlog_cache_size_basic_32.test
  mysql-test/suite/sys_vars/t/binlog_cache_size_basic_64.test
  mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_32.test
  mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_64.test
  mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_32.test
  mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_64.test
  mysql-test/suite/sys_vars/t/delayed_queue_size_basic_32.test
  mysql-test/suite/sys_vars/t/delayed_queue_size_basic_64.test
  mysql-test/suite/sys_vars/t/innodb_concurrency_tickets_basic_32.test
  mysql-test/suite/sys_vars/t/innodb_concurrency_tickets_basic_64.test
  mysql-test/suite/sys_vars/t/innodb_max_purge_lag_basic_32.test
  mysql-test/suite/sys_vars/t/innodb_max_purge_lag_basic_64.test
  mysql-test/suite/sys_vars/t/innodb_sync_spin_loops_basic_32.test
  mysql-test/suite/sys_vars/t/innodb_sync_spin_loops_basic_64.test
  mysql-test/suite/sys_vars/t/join_buffer_size_basic_32.test
  mysql-test/suite/sys_vars/t/join_buffer_size_basic_64.test
  mysql-test/suite/sys_vars/t/key_buffer_size_basic_32.test
  mysql-test/suite/sys_vars/t/key_buffer_size_basic_64.test
  mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_32.test
  mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_64.test
  mysql-test/suite/sys_vars/t/key_cache_block_size_basic_32.test
  mysql-test/suite/sys_vars/t/key_cache_block_size_basic_64.test
  mysql-test/suite/sys_vars/t/key_cache_division_limit_basic_32.test
  mysql-test/suite/sys_vars/t/key_cache_division_limit_basic_64.test
  mysql-test/suite/sys_vars/t/log_warnings_basic_32.test
  mysql-test/suite/sys_vars/t/log_warnings_basic_64.test
  mysql-test/suite/sys_vars/t/max_binlog_cache_size_basic_32.test
  mysql-test/suite/sys_vars/t/max_binlog_cache_size_basic_64.test
  mysql-test/suite/sys_vars/t/max_connect_errors_basic_32.test
  mysql-test/suite/sys_vars/t/max_connect_errors_basic_64.test
  mysql-test/suite/sys_vars/t/max_heap_table_size_basic_32.test
  mysql-test/suite/sys_vars/t/max_heap_table_size_basic_64.test
  mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_32.test
  mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_64.test
  mysql-test/suite/sys_vars/t/max_tmp_tables_basic_32.test
  mysql-test/suite/sys_vars/t/max_tmp_tables_basic_64.test
  mysql-test/suite/sys_vars/t/max_write_lock_count_basic_32.test
  mysql-test/suite/sys_vars/t/max_write_lock_count_basic_64.test
  mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_32.test
  mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_64.test
  mysql-test/suite/sys_vars/t/multi_range_count_basic_32.test
  mysql-test/suite/sys_vars/t/multi_range_count_basic_64.test
  mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_32.test
  mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_64.test
  mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_32.test
  mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_64.test
  mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_32.test
  mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_64.test
  mysql-test/suite/sys_vars/t/net_retry_count_basic_32.test
  mysql-test/suite/sys_vars/t/net_retry_count_basic_64.test
  mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_32.test
  mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_64.test
  mysql-test/suite/sys_vars/t/query_cache_limit_basic_32.test
  mysql-test/suite/sys_vars/t/query_cache_limit_basic_64.test
  mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_32.test
  mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_64.test
  mysql-test/suite/sys_vars/t/query_cache_size_basic_32.test
  mysql-test/suite/sys_vars/t/query_cache_size_basic_64.test
  mysql-test/suite/sys_vars/t/query_prealloc_size_basic_32.test
  mysql-test/suite/sys_vars/t/query_prealloc_size_basic_64.test
  mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_32.test
  mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_64.test
  mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_32.test
  mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_64.test
  mysql-test/suite/sys_vars/t/server_id_basic_32.test
  mysql-test/suite/sys_vars/t/server_id_basic_64.test
  mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_32.test
  mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_64.test
  mysql-test/suite/sys_vars/t/sort_buffer_size_basic_32.test
  mysql-test/suite/sys_vars/t/sort_buffer_size_basic_64.test
  mysql-test/suite/sys_vars/t/sync_binlog_basic_32.test
  mysql-test/suite/sys_vars/t/sync_binlog_basic_64.test
  mysql-test/suite/sys_vars/t/timestamp_basic_32.test
  mysql-test/suite/sys_vars/t/timestamp_basic_64.test
  mysql-test/suite/sys_vars/t/tmp_table_size_basic_32.test
  mysql-test/suite/sys_vars/t/tmp_table_size_basic_64.test
  mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_32.test
  mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_64.test
  mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_32.test
  mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_64.test
  mysql-test/suite/sys_vars/t/wait_timeout_basic_32.test
  mysql-test/suite/sys_vars/t/wait_timeout_basic_64.test
  mysql-test/t/concurrent_innodb_safelog-master.opt
  mysql-test/t/concurrent_innodb_safelog.test
  mysql-test/t/concurrent_innodb_unsafelog-master.opt
  mysql-test/t/concurrent_innodb_unsafelog.test
  mysql-test/t/innodb-autoinc-optimize.test
  mysql-test/t/innodb-autoinc.test
  mysql-test/t/innodb_bug34300.test
  mysql-test/t/innodb_bug35220.test
  mysql-test/t/mysqlbinlog_row.test
  mysql-test/t/mysqlbinlog_row_big.test
  mysql-test/t/mysqlbinlog_row_innodb.test
  mysql-test/t/mysqlbinlog_row_myisam.test
  mysql-test/t/mysqlbinlog_row_trans.test
  mysql-test/t/parser_stack.test
  mysql-test/t/skip_log_bin-master.opt
  mysql-test/t/skip_log_bin.test
  sql/mysql_priv.h.pp
  win/build-vs9.bat
  win/build-vs9_x64.bat
renamed:
  mysql-test/suite/funcs_1/r/innodb_storedproc.result =>
mysql-test/suite/funcs_1/r/storedproc.result
  mysql-test/suite/funcs_1/storedproc/storedproc_master.inc =>
mysql-test/suite/funcs_1/t/storedproc.test
  mysql-test/suite/parts/inc/partition_alter2.inc =>
mysql-test/suite/parts/inc/partition_alter2_1.inc
  mysql-test/suite/parts/r/partition_alter2_innodb.result =>
mysql-test/suite/parts/r/partition_alter2_1_innodb.result
  mysql-test/suite/parts/r/partition_alter2_myisam.result =>
mysql-test/suite/parts/r/partition_alter2_1_myisam.result
  mysql-test/suite/parts/t/partition_alter2_innodb.test =>
mysql-test/suite/parts/t/partition_alter2_1_innodb.test
  mysql-test/suite/parts/t/partition_alter2_myisam.test =>
mysql-test/suite/parts/t/partition_alter2_1_myisam.test
  mysql-test/suite/rpl/r/rpl_truncate_7ndb_2.result =>
mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result
  mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt =>
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt
  mysql-test/suite/rpl/t/rpl_truncate_7ndb_2.test =>
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test
modified:
  .bzrignore
  BUILD/check-cpu
  BUILD/compile-solaris-amd64-forte*
  BUILD/compile-solaris-amd64-forte-debug
  BUILD/compile-solaris-sparc
  BUILD/compile-solaris-sparc-forte
  CMakeLists.txt
  Makefile.am
  client/Makefile.am
  client/mysql.cc
  client/mysql_upgrade.c
  client/mysqlbinlog.cc
  client/mysqldump.c
  client/mysqltest.c
  config/ac-macros/character_sets.m4
  configure.in
  extra/Makefile.am
  extra/yassl/Makefile.am
  extra/yassl/taocrypt/Makefile.am
  include/Makefile.am
  include/hash.h
  include/my_sys.h
  include/myisam.h
  include/thr_lock.h
  libmysql/dll.c
  libmysqld/lib_sql.cc
  man/Makefile.am
  mysql-test/Makefile.am
  mysql-test/extra/binlog_tests/binlog.test
  mysql-test/extra/binlog_tests/binlog_insert_delayed.test
  mysql-test/extra/binlog_tests/blackhole.test
  mysql-test/extra/binlog_tests/database.test
  mysql-test/extra/binlog_tests/innodb_stat.test
  mysql-test/extra/rpl_tests/rpl_EE_err.test
  mysql-test/extra/rpl_tests/rpl_ddl.test
  mysql-test/extra/rpl_tests/rpl_log.test
  mysql-test/extra/rpl_tests/rpl_row_basic.test
  mysql-test/include/concurrent.inc
  mysql-test/include/grant_cache.inc
  mysql-test/include/have_lowercase0.inc
  mysql-test/include/index_merge1.inc
  mysql-test/include/mix1.inc
  mysql-test/include/ndb_backup_print.inc
  mysql-test/include/show_binlog_events.inc
  mysql-test/lib/mtr_cases.pl
  mysql-test/lib/mtr_report.pl
  mysql-test/mysql-test-run.pl
  mysql-test/r/auto_increment.result
  mysql-test/r/client_xml.result
  mysql-test/r/compare.result
  mysql-test/r/create.result
  mysql-test/r/csv.result
  mysql-test/r/ctype_cp932_binlog_stm.result
  mysql-test/r/ctype_ucs.result
  mysql-test/r/default.result
  mysql-test/r/distinct.result
  mysql-test/r/events_2.result
  mysql-test/r/federated.result
  mysql-test/r/federated_bug_25714.result
  mysql-test/r/func_group.result
  mysql-test/r/func_if.result
  mysql-test/r/func_in.result
  mysql-test/r/func_regexp.result
  mysql-test/r/grant2.result
  mysql-test/r/grant_cache_no_prot.result
  mysql-test/r/grant_cache_ps_prot.result
  mysql-test/r/group_min_max.result
  mysql-test/r/handler_innodb.result
  mysql-test/r/index_merge_myisam.result
  mysql-test/r/information_schema_db.result
  mysql-test/r/innodb-semi-consistent.result
  mysql-test/r/innodb.result
  mysql-test/r/innodb_mysql.result
  mysql-test/r/join.result
  mysql-test/r/loaddata.result
  mysql-test/r/lock_multi.result
  mysql-test/r/log_basic.result
  mysql-test/r/log_bin_trust_routine_creators_basic.result
  mysql-test/r/log_state.result
  mysql-test/r/log_tables.result
  mysql-test/r/lowercase0.require
  mysql-test/r/metadata.result
  mysql-test/r/multi_update.result
  mysql-test/r/myisam.result
  mysql-test/r/mysql.result
  mysql-test/r/mysqldump-max.result
  mysql-test/r/mysqldump.result
  mysql-test/r/mysqltest.result
  mysql-test/r/partition.result
  mysql-test/r/partition_range.result
  mysql-test/r/partition_symlink.result
  mysql-test/r/ps_1general.result
  mysql-test/r/ps_2myisam.result
  mysql-test/r/ps_3innodb.result
  mysql-test/r/ps_4heap.result
  mysql-test/r/ps_5merge.result
  mysql-test/r/ps_ddl.result
  mysql-test/r/show_check.result
  mysql-test/r/slow_launch_time_func.result
  mysql-test/r/sp-error.result
  mysql-test/r/sp.result
  mysql-test/r/status.result
  mysql-test/r/subselect.result
  mysql-test/r/subselect3.result
  mysql-test/r/symlink.result
  mysql-test/r/trigger-trans.result
  mysql-test/r/tx_isolation_func.result
  mysql-test/r/type_bit.result
  mysql-test/r/type_datetime.result
  mysql-test/r/type_newdecimal.result
  mysql-test/r/type_set.result
  mysql-test/r/user_var.result
  mysql-test/r/view_grant.result
  mysql-test/r/warnings.result
  mysql-test/suite/binlog/r/binlog_database.result
  mysql-test/suite/binlog/r/binlog_innodb.result
  mysql-test/suite/binlog/r/binlog_killed_simulate.result
  mysql-test/suite/binlog/r/binlog_multi_engine.result
  mysql-test/suite/binlog/r/binlog_row_binlog.result
  mysql-test/suite/binlog/r/binlog_row_innodb_stat.result
  mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
  mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result
  mysql-test/suite/binlog/r/binlog_stm_binlog.result
  mysql-test/suite/binlog/r/binlog_stm_blackhole.result
  mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result
  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
  mysql-test/suite/binlog/t/binlog_killed.test
  mysql-test/suite/binlog/t/binlog_killed_simulate.test
  mysql-test/suite/binlog/t/binlog_multi_engine.test
  mysql-test/suite/binlog/t/binlog_start_comment.test
  mysql-test/suite/binlog/t/binlog_stm_innodb_stat.test
  mysql-test/suite/funcs_1/datadict/processlist_priv.inc
  mysql-test/suite/funcs_1/datadict/processlist_val.inc
  mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
  mysql-test/suite/funcs_1/r/processlist_priv_ps.result
  mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
  mysql-test/suite/funcs_1/r/processlist_val_ps.result
  mysql-test/suite/funcs_1/triggers/triggers_03.inc
  mysql-test/suite/funcs_1/triggers/triggers_08.inc
  mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
  mysql-test/suite/funcs_1/views/func_view.inc
  mysql-test/suite/jp/std_data/jisx0208_sjis2.dat
  mysql-test/suite/jp/t/disabled.def
  mysql-test/suite/ndb/r/ndb_alter_table.result
  mysql-test/suite/ndb/r/ndb_partition_key.result
  mysql-test/suite/ndb/r/ps_7ndb.result
  mysql-test/suite/ndb/t/ndb_alter_table.test
  mysql-test/suite/ndb/t/ndb_partition_key.test
  mysql-test/suite/ndb/t/ndb_restore_print.test
  mysql-test/suite/ndb_team/t/ndb_autodiscover.test
  mysql-test/suite/parts/inc/partition_alter4.inc
  mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result
  mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result
  mysql-test/suite/parts/r/partition_alter1_1_innodb.result
  mysql-test/suite/parts/r/partition_alter1_1_myisam.result
  mysql-test/suite/parts/r/partition_alter1_2_innodb.result
  mysql-test/suite/parts/r/partition_alter1_2_myisam.result
  mysql-test/suite/parts/r/partition_alter4_innodb.result
  mysql-test/suite/parts/r/partition_alter4_myisam.result
  mysql-test/suite/parts/r/partition_basic_innodb.result
  mysql-test/suite/parts/r/partition_basic_myisam.result
  mysql-test/suite/parts/r/partition_basic_symlink_myisam.result
  mysql-test/suite/parts/r/partition_engine_innodb.result
  mysql-test/suite/parts/r/partition_engine_myisam.result
  mysql-test/suite/parts/r/partition_special_innodb.result
  mysql-test/suite/parts/t/disabled.def
  mysql-test/suite/parts/t/partition_special_innodb.test
  mysql-test/suite/rpl/r/rpl_failed_optimize.result
  mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
  mysql-test/suite/rpl/r/rpl_loaddata_map.result
  mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
  mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
  mysql-test/suite/rpl/r/rpl_row_create_table.result
  mysql-test/suite/rpl/r/rpl_row_log.result
  mysql-test/suite/rpl/r/rpl_row_log_innodb.result
  mysql-test/suite/rpl/r/rpl_server_id1.result
  mysql-test/suite/rpl/r/rpl_sp.result
  mysql-test/suite/rpl/r/rpl_stm_log.result
  mysql-test/suite/rpl/r/rpl_temporary.result
  mysql-test/suite/rpl/r/rpl_variables.result
  mysql-test/suite/rpl/t/disabled.def
  mysql-test/suite/rpl/t/rpl_incident.test
  mysql-test/suite/rpl/t/rpl_loaddata_map.test
  mysql-test/suite/rpl/t/rpl_row_create_table.test
  mysql-test/suite/rpl/t/rpl_server_id1.test
  mysql-test/suite/rpl/t/rpl_stm_log-slave.opt
  mysql-test/suite/rpl/t/rpl_temporary.test
  mysql-test/suite/rpl/t/rpl_trunc_temp.test
  mysql-test/suite/rpl/t/rpl_variables.test
  mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result
  mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result
  mysql-test/t/auto_increment.test
  mysql-test/t/client_xml.test
  mysql-test/t/compare.test
  mysql-test/t/create.test
  mysql-test/t/csv.test
  mysql-test/t/ctype_big5.test
  mysql-test/t/ctype_ucs.test
  mysql-test/t/default.test
  mysql-test/t/disabled.def
  mysql-test/t/distinct.test
  mysql-test/t/events_2.test
  mysql-test/t/federated.test
  mysql-test/t/federated_bug_25714.test
  mysql-test/t/func_group.test
  mysql-test/t/func_if.test
  mysql-test/t/func_in.test
  mysql-test/t/func_regexp.test
  mysql-test/t/grant2.test
  mysql-test/t/group_min_max.test
  mysql-test/t/information_schema_db.test
  mysql-test/t/innodb-semi-consistent.test
  mysql-test/t/innodb.test
  mysql-test/t/join.test
  mysql-test/t/loaddata.test
  mysql-test/t/lock_multi.test
  mysql-test/t/log_basic.test
  mysql-test/t/log_state.test
  mysql-test/t/log_tables.test
  mysql-test/t/lowercase_table3.test
  mysql-test/t/myisam.test
  mysql-test/t/mysql_delimiter.sql
  mysql-test/t/mysqldump-max.test
  mysql-test/t/mysqldump.test
  mysql-test/t/mysqltest.test
  mysql-test/t/outfile.test
  mysql-test/t/partition.test
  mysql-test/t/partition_not_windows.test
  mysql-test/t/partition_range.test
  mysql-test/t/partition_symlink.test
  mysql-test/t/ps_ddl.test
  mysql-test/t/show_check.test
  mysql-test/t/slow_launch_time_func.test
  mysql-test/t/sp-error.test
  mysql-test/t/sp.test
  mysql-test/t/status.test
  mysql-test/t/subselect.test
  mysql-test/t/subselect3.test
  mysql-test/t/symlink.test
  mysql-test/t/trigger-trans.test
  mysql-test/t/tx_isolation_func.test
  mysql-test/t/type_bit.test
  mysql-test/t/type_datetime.test
  mysql-test/t/type_newdecimal.test
  mysql-test/t/type_set.test
  mysql-test/t/user_var.test
  mysql-test/t/view_grant.test
  mysys/hash.c
  mysys/mf_pack.c
  mysys/my_static.c
  mysys/my_static.h
  mysys/my_symlink.c
  mysys/safemalloc.c
  mysys/stacktrace.c
  mysys/thr_lock.c
  netware/BUILD/compile-linux-tools
  netware/BUILD/nwbootstrap
  netware/Makefile.am
  netware/mysql_install_db.c
  scripts/make_binary_distribution.sh
  scripts/mysql_install_db.sh
  scripts/mysql_system_tables_data.sql
  sql/event_data_objects.cc
  sql/event_db_repository.cc
  sql/event_parse_data.cc
  sql/event_parse_data.h
  sql/events.cc
  sql/field.cc
  sql/field.h
  sql/filesort.cc
  sql/ha_ndbcluster.cc
  sql/ha_partition.cc
  sql/ha_partition.h
  sql/handler.cc
  sql/handler.h
  sql/item.cc
  sql/item.h
  sql/item_cmpfunc.cc
  sql/item_cmpfunc.h
  sql/item_func.cc
  sql/item_func.h
  sql/lock.cc
  sql/log.cc
  sql/log.h
  sql/log_event.cc
  sql/log_event.h
  sql/mysql_priv.h
  sql/mysqld.cc
  sql/opt_range.cc
  sql/opt_range.h
  sql/parse_file.cc
  sql/parse_file.h
  sql/partition_info.h
  sql/protocol.cc
  sql/records.cc
  sql/rpl_tblmap.cc
  sql/rpl_tblmap.h
  sql/rpl_utility.h
  sql/set_var.cc
  sql/set_var.h
  sql/share/errmsg.txt
  sql/sp.cc
  sql/sp_head.cc
  sql/sql_acl.cc
  sql/sql_base.cc
  sql/sql_binlog.cc
  sql/sql_cache.cc
  sql/sql_class.cc
  sql/sql_class.h
  sql/sql_cursor.cc
  sql/sql_db.cc
  sql/sql_delete.cc
  sql/sql_derived.cc
  sql/sql_help.cc
  sql/sql_insert.cc
  sql/sql_lex.cc
  sql/sql_lex.h
  sql/sql_list.h
  sql/sql_load.cc
  sql/sql_parse.cc
  sql/sql_partition.cc
  sql/sql_plugin.cc
  sql/sql_prepare.cc
  sql/sql_select.cc
  sql/sql_servers.cc
  sql/sql_show.cc
  sql/sql_show.h
  sql/sql_string.h
  sql/sql_table.cc
  sql/sql_trigger.cc
  sql/sql_udf.cc
  sql/sql_union.cc
  sql/sql_update.cc
  sql/sql_view.cc
  sql/sql_yacc.yy
  sql/table.cc
  sql/table.h
  sql/thr_malloc.cc
  storage/blackhole/ha_blackhole.cc
  storage/blackhole/ha_blackhole.h
  storage/csv/ha_tina.cc
  storage/federated/ha_federated.cc
  storage/innobase/buf/buf0buf.c
  storage/innobase/ha/ha0ha.c
  storage/innobase/handler/ha_innodb.cc
  storage/innobase/include/buf0buf.h
  storage/innobase/include/mach0data.h
  storage/innobase/include/mach0data.ic
  storage/innobase/include/srv0srv.h
  storage/innobase/lock/lock0lock.c
  storage/innobase/row/row0sel.c
  storage/innobase/srv/srv0srv.c
  storage/myisam/mi_check.c
  storage/myisam/mi_create.c
  storage/myisam/mi_open.c
  storage/myisam/mi_static.c
  storage/myisam/myisamchk.c
  storage/myisam/myisamdef.h
  storage/myisam/rt_index.c
  strings/decimal.c
  support-files/build-tags
  support-files/my-huge.cnf.sh
  support-files/my-innodb-heavy-4G.cnf.sh
  support-files/my-large.cnf.sh
  support-files/my-medium.cnf.sh
  support-files/my-small.cnf.sh
  support-files/mysql.spec.sh
  tests/mysql_client_test.c
  win/create_manifest.js
  zlib/gzio.c
  zlib/zutil.h
  mysql-test/suite/funcs_1/r/storedproc.result
  mysql-test/suite/funcs_1/t/storedproc.test
  mysql-test/suite/parts/inc/partition_alter2_1.inc
  mysql-test/suite/parts/r/partition_alter2_1_innodb.result
  mysql-test/suite/parts/r/partition_alter2_1_myisam.result
  mysql-test/suite/parts/t/partition_alter2_1_innodb.test
  mysql-test/suite/parts/t/partition_alter2_1_myisam.test
  mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result
  mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test

=== modified file 'Makefile.am'
--- a/Makefile.am	2008-10-20 17:05:35 +0000
+++ b/Makefile.am	2008-10-20 18:07:51 +0000
@@ -49,15 +49,8 @@ bin-dist:		all
 	$(top_builddir)/scripts/make_binary_distribution @MAKE_BINARY_DISTRIBUTION_OPTIONS@
 
 # Remove BK's "SCCS" subdirectories from source distribution
-# Create initial database files for Windows installations and check them.
 dist-hook:
 	-rm -rf `find $(distdir) -type d -name SCCS -print`
-	mkdir -p $(distdir)/win
-	scripts/mysql_install_db --no-defaults --cross-bootstrap \
-		--builddir=$(top_builddir) \
-		--datadir=$(distdir)/win/data \
-		--srcdir=$(top_srcdir)
-	storage/myisam/myisamchk --silent --fast $(distdir)/win/data/mysql/*.MYI
 
 all-local:		@ABI_CHECK@	
 

Thread
bzr push into mysql-5.1 branch (df:2707 to 2708) Daniel Fischer20 Oct