| List: | Commits | « Previous MessageNext Message » | |
| From: | Vladislav Vaintroub | Date: | August 11 2008 6:21pm |
| Subject: | bzr push into mysql-6.0-falcon branch (vvaintroub:2772) | ||
| View as plain text | |||
2772 Vladislav Vaintroub 2008-08-11 [merge]
merge 6.0-falcon->6.0-falcon-team
removed:
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/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/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/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/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/rpl_slave_transaction_retries_basic_32.result
mysql-test/r/rpl_slave_transaction_retries_basic_64.result
mysql-test/r/rpl_sync_binlog_basic_32.result
mysql-test/r/rpl_sync_binlog_basic_64.result
mysql-test/r/server_id_basic_32.result
mysql-test/r/server_id_basic_64.result
mysql-test/r/sort_buffer_size_basic_32.result
mysql-test/r/sort_buffer_size_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/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/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/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/rpl_slave_transaction_retries_basic_32.test
mysql-test/t/rpl_slave_transaction_retries_basic_64.test
mysql-test/t/rpl_sync_binlog_basic_32.test
mysql-test/t/rpl_sync_binlog_basic_64.test
mysql-test/t/server_id_basic_32.test
mysql-test/t/server_id_basic_64.test
mysql-test/t/sort_buffer_size_basic_32.test
mysql-test/t/sort_buffer_size_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
added:
mysql-test/include/ctype_datetime.inc
mysql-test/include/implicit_commit_helper.inc
mysql-test/include/query_prealloc_size_basic.inc
mysql-test/include/transaction_prealloc_size_basic.inc
mysql-test/include/weight_string_euro.inc
mysql-test/r/implicit_commit.result
mysql-test/r/parser_stack.result
mysql-test/suite/falcon/r/falcon_tablespace_priv.result
mysql-test/suite/falcon/t/falcon_tablespace_priv.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/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/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/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/implicit_commit.test
mysql-test/t/parser_stack.test
modified:
.bzr-mysql/default.conf
BUILD/SETUP.sh
client/mysqltest.c
include/m_ctype.h
include/my_handler.h
include/my_sys.h
include/myisam.h
include/myisamchk.h
mysql-test/extra/rpl_tests/rpl_row_basic.test
mysql-test/include/commit.inc
mysql-test/include/mix1.inc
mysql-test/include/weight_string.inc
mysql-test/include/weight_string_8140.inc
mysql-test/include/weight_string_8EA1.inc
mysql-test/include/weight_string_8FA2C3.inc
mysql-test/include/weight_string_A1A1.inc
mysql-test/include/weight_string_chde.inc
mysql-test/mysql-test-run.pl
mysql-test/r/binlog_index.result
mysql-test/r/client_xml.result
mysql-test/r/commit_1innodb.result
mysql-test/r/ctype_big5.result
mysql-test/r/ctype_cp1250_ch.result
mysql-test/r/ctype_cp932_binlog_stm.result
mysql-test/r/ctype_eucjpms.result
mysql-test/r/ctype_euckr.result
mysql-test/r/ctype_gb2312.result
mysql-test/r/ctype_gbk.result
mysql-test/r/ctype_latin1.result
mysql-test/r/ctype_latin1_de.result
mysql-test/r/ctype_latin2.result
mysql-test/r/ctype_latin2_ch.result
mysql-test/r/ctype_ldml.result
mysql-test/r/ctype_sjis.result
mysql-test/r/ctype_tis620.result
mysql-test/r/ctype_uca.result
mysql-test/r/ctype_ucs.result
mysql-test/r/ctype_ujis.result
mysql-test/r/ctype_utf16.result
mysql-test/r/ctype_utf16_uca.result
mysql-test/r/ctype_utf32.result
mysql-test/r/ctype_utf32_uca.result
mysql-test/r/ctype_utf8.result
mysql-test/r/date_formats.result
mysql-test/r/func_compress.result
mysql-test/r/func_digest.result
mysql-test/r/func_encrypt.result
mysql-test/r/func_encrypt_nossl.result
mysql-test/r/func_in.result
mysql-test/r/func_math.result
mysql-test/r/func_misc.result
mysql-test/r/func_str.result
mysql-test/r/grant.result
mysql-test/r/innodb_mysql.result
mysql-test/r/merge.result
mysql-test/r/myisam-system.result
mysql-test/r/mysqltest.result
mysql-test/r/ps.result
mysql-test/r/strict.result
mysql-test/r/system_mysql_db.result
mysql-test/r/trigger.result
mysql-test/r/type_newdecimal.result
mysql-test/r/view.result
mysql-test/std_data/Index.xml
mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result
mysql-test/suite/falcon/r/falcon_bug_22972.result
mysql-test/suite/funcs_1/r/falcon_func_view.result
mysql-test/suite/funcs_1/r/innodb_func_view.result
mysql-test/suite/funcs_1/r/memory_func_view.result
mysql-test/suite/funcs_1/r/myisam_func_view.result
mysql-test/suite/funcs_1/r/ndb_func_view.result
mysql-test/suite/ndb/r/ndb_bitfield.result
mysql-test/suite/ndb/r/ndb_dd_ddl.result
mysql-test/suite/ndb/r/ndb_gis.result
mysql-test/suite/ndb/r/ndb_multi_row.result
mysql-test/suite/ndb/r/ndb_partition_error.result
mysql-test/suite/ndb/r/ndb_single_user.result
mysql-test/suite/ndb/t/ndb_dd_ddl.test
mysql-test/suite/rpl/r/rpl_EE_err.result
mysql-test/suite/rpl/r/rpl_server_id1.result
mysql-test/suite/rpl/r/rpl_temporary.result
mysql-test/suite/rpl/t/disabled.def
mysql-test/suite/rpl/t/rpl_server_id1.test
mysql-test/suite/rpl/t/rpl_temporary.test
mysql-test/t/client_xml.test
mysql-test/t/ctype_cp1250_ch.test
mysql-test/t/ctype_latin1.test
mysql-test/t/ctype_latin1_de.test
mysql-test/t/ctype_latin2_ch.test
mysql-test/t/ctype_ldml.test
mysql-test/t/ctype_uca.test
mysql-test/t/ctype_ucs.test
mysql-test/t/ctype_utf16.test
mysql-test/t/ctype_utf16_uca.test
mysql-test/t/ctype_utf32.test
mysql-test/t/ctype_utf32_uca.test
mysql-test/t/ctype_utf8.test
mysql-test/t/disabled.def
mysql-test/t/func_in.test
mysql-test/t/func_misc.test
mysql-test/t/mysqltest.test
mysys/charset.c
mysys/my_uuid.c
scripts/mysql_system_tables.sql
scripts/mysql_system_tables_data.sql
scripts/mysql_system_tables_fix.sql
sql/event_data_objects.cc
sql/event_db_repository.cc
sql/events.cc
sql/field.cc
sql/filesort.cc
sql/ha_ndbcluster.cc
sql/ha_ndbcluster_binlog.cc
sql/handler.cc
sql/handler.h
sql/item.cc
sql/item_cmpfunc.cc
sql/item_func.cc
sql/item_strfunc.cc
sql/item_strfunc.h
sql/item_subselect.cc
sql/item_timefunc.cc
sql/log.cc
sql/log_event.cc
sql/mdl.cc
sql/my_decimal.cc
sql/mysql_priv.h
sql/opt_range.cc
sql/opt_range.h
sql/probes.h
sql/records.cc
sql/set_var.cc
sql/sp.cc
sql/sp_head.cc
sql/sql_acl.cc
sql/sql_acl.h
sql/sql_cache.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_delete.cc
sql/sql_help.cc
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_parse.cc
sql/sql_partition.cc
sql/sql_plugin.cc
sql/sql_prepare.cc
sql/sql_select.cc
sql/sql_select.h
sql/sql_servers.cc
sql/sql_show.cc
sql/sql_string.cc
sql/sql_table.cc
sql/sql_tablespace.cc
sql/sql_trigger.cc
sql/sql_udf.cc
sql/sql_update.cc
sql/sql_view.cc
sql/sql_yacc.yy
sql/table.cc
sql/unireg.cc
storage/falcon/MemMgr.cpp
storage/myisam/ft_static.c
storage/myisam/mi_open.c
storage/myisammrg/ha_myisammrg.cc
strings/conf_to_src.c
strings/ctype-czech.c
strings/ctype-mb.c
strings/ctype-simple.c
strings/ctype-tis620.c
strings/ctype-uca.c
strings/ctype-ucs2.c
strings/ctype-utf8.c
strings/ctype-win1250ch.c
tests/mysql_client_test.c
=== renamed file 'mysql-test/suite/falcon_team/r/falcon_bug_22165.result' =>
'mysql-test/suite/falcon/r/falcon_bug_22165.result'
--- a/mysql-test/suite/falcon_team/r/falcon_bug_22165.result 2008-08-04 09:21:20 +0000
+++ b/mysql-test/suite/falcon/r/falcon_bug_22165.result 2008-08-04 15:53:52 +0000
@@ -1,11 +1,8 @@
*** Bug #22165 ***
SET @@storage_engine = 'Falcon';
-DROP PROCEDURE IF EXISTS db1.p1;
-DROP EVENT IF EXISTS db1.e1;
-DROP EVENT IF EXISTS db1.e2;
-DROP DATABASE IF EXISTS db1;
-CREATE DATABASE db1;
-USE db1;
+DROP TABLE IF EXISTS t1;
+DROP PROCEDURE IF EXISTS p1;
+CREATE TABLE t1 (a bigint, b varchar(1000), c timestamp);
CREATE PROCEDURE p1 ()
begin
declare v int default 0;
@@ -23,13 +20,5 @@ COMMIT;
SET v = v + 1;
end while;
end//
-CREATE TABLE t1 (a bigint, b varchar(1000), c timestamp);
-CREATE EVENT e1 ON SCHEDULE EVERY 1 second DO CALL db1.p1();
-CREATE EVENT e2 ON SCHEDULE EVERY 1 second DO CALL db1.p1();
-SET GLOBAL event_scheduler = 1;
-SET GLOBAL event_scheduler = 0;
-USE test;
-DROP EVENT db1.e1;
-DROP EVENT db1.e2;
-DROP PROCEDURE db1.p1;
-DROP DATABASE db1;
+DROP PROCEDURE p1;
+DROP TABLE t1;
=== renamed file 'mysql-test/suite/falcon_team/r/falcon_bug_22173.result' =>
'mysql-test/suite/falcon/r/falcon_bug_22173.result'
=== renamed file 'mysql-test/suite/falcon_team/r/falcon_bug_22173a.result' =>
'mysql-test/suite/falcon/r/falcon_bug_22173a.result'
--- a/mysql-test/suite/falcon_team/r/falcon_bug_22173a.result 2008-04-20 08:30:43 +0000
+++ b/mysql-test/suite/falcon/r/falcon_bug_22173a.result 2008-08-04 15:53:52 +0000
@@ -12,6 +12,7 @@ begin declare v1 int default 0;
declare v2 int;
declare continue handler for 1020 begin end;
declare continue handler for 1213 begin end;
+declare continue handler for 1015 begin end;
while v1 < 2500 do
/* SELECT 'insert', v1; */
INSERT INTO t1 VALUES (v1);
=== modified file 'mysql-test/suite/falcon/t/disabled.def'
--- a/mysql-test/suite/falcon/t/disabled.def 2008-05-22 12:58:47 +0000
+++ b/mysql-test/suite/falcon/t/disabled.def 2008-08-07 21:11:55 +0000
@@ -12,3 +12,4 @@
falcon_bug_28095_I : Bug#xxxxx 2008-04-22 hakank Disabled until soft restart is in main
tree
falcon_bug_28095_II : Bug#xxxxx 2008-03-22 hakank Disabled until soft restart is in main
tree
+falcon_bug_22165 : Bug#22165 2008-08-07 wlad Disabled temporarily, because it crashes.
Work in progress
=== renamed file 'mysql-test/suite/falcon_team/t/falcon_bug_22165.test' =>
'mysql-test/suite/falcon/t/falcon_bug_22165.test'
--- a/mysql-test/suite/falcon_team/t/falcon_bug_22165.test 2008-07-22 13:19:24 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_22165.test 2008-08-04 15:53:52 +0000
@@ -11,14 +11,11 @@ let $engine = 'Falcon';
eval SET @@storage_engine = $engine;
--disable_warnings
-DROP PROCEDURE IF EXISTS db1.p1;
-DROP EVENT IF EXISTS db1.e1;
-DROP EVENT IF EXISTS db1.e2;
-DROP DATABASE IF EXISTS db1;
+DROP TABLE IF EXISTS t1;
+DROP PROCEDURE IF EXISTS p1;
--enable_warnings
+CREATE TABLE t1 (a bigint, b varchar(1000), c timestamp);
-CREATE DATABASE db1;
-USE db1;
delimiter //;
CREATE PROCEDURE p1 ()
begin
@@ -39,18 +36,31 @@ begin
end//
delimiter ;//
-CREATE TABLE t1 (a bigint, b varchar(1000), c timestamp);
+connect (conn1,localhost,root,,);
+connect (conn2,localhost,root,,);
+
-CREATE EVENT e1 ON SCHEDULE EVERY 1 second DO CALL db1.p1();
-CREATE EVENT e2 ON SCHEDULE EVERY 1 second DO CALL db1.p1();
# ----------------------------------------------------- #
# --- Test --- #
# ----------------------------------------------------- #
-SET GLOBAL event_scheduler = 1;
---sleep 60
-SET GLOBAL event_scheduler = 0;
-
+--disable_query_log
+let $i=150;
+while ($i)
+{
+ connection conn1;
+ --send call p1();
+ connection conn2;
+ --send call p1();
+
+ connection conn1;
+ --reap
+ connection conn2;
+ --reap
+
+ dec $i;
+}
+--enable_query_log
# ----------------------------------------------------- #
# --- Check --- #
# ----------------------------------------------------- #
@@ -60,8 +70,9 @@ SET GLOBAL event_scheduler = 0;
# ----------------------------------------------------- #
# --- Final cleanup --- #
# ----------------------------------------------------- #
-USE test;
-DROP EVENT db1.e1;
-DROP EVENT db1.e2;
-DROP PROCEDURE db1.p1;
-DROP DATABASE db1;
+connection default;
+disconnect conn1;
+disconnect conn2;
+DROP PROCEDURE p1;
+DROP TABLE t1;
+
=== renamed file 'mysql-test/suite/falcon_team/t/falcon_bug_22173.test' =>
'mysql-test/suite/falcon/t/falcon_bug_22173.test'
=== renamed file 'mysql-test/suite/falcon_team/t/falcon_bug_22173a.test' =>
'mysql-test/suite/falcon/t/falcon_bug_22173a.test'
--- a/mysql-test/suite/falcon_team/t/falcon_bug_22173a.test 2008-04-20 08:30:43 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_22173a.test 2008-08-04 15:53:52 +0000
@@ -31,6 +31,7 @@ begin declare v1 int default 0;
declare v2 int;
declare continue handler for 1020 begin end;
declare continue handler for 1213 begin end;
+declare continue handler for 1015 begin end;
while v1 < 2500 do
/* SELECT 'insert', v1; */
INSERT INTO t1 VALUES (v1);
@@ -52,7 +53,6 @@ delimiter ;//
--echo # Switch to connection conn1
connection conn1;
---real_sleep 1
call p1();
--echo # Switch to connection default
=== modified file 'mysql-test/suite/falcon/t/falcon_bug_37080.test'
--- a/mysql-test/suite/falcon/t/falcon_bug_37080.test 2008-07-16 17:52:19 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_37080.test 2008-08-04 15:53:52 +0000
@@ -31,8 +31,10 @@ while ($num)
connection default;
--send truncate table t1;
connection conn1;
+ --error 0,ER_CANT_LOCK
--reap
connection default;
+ --error 0,ER_CANT_LOCK
--reap
dec $num;
}
=== modified file 'storage/falcon/Dbb.cpp'
--- a/storage/falcon/Dbb.cpp 2008-07-24 08:45:03 +0000
+++ b/storage/falcon/Dbb.cpp 2008-08-07 21:11:55 +0000
@@ -369,6 +369,8 @@ void Dbb::expungeRecord(Section *section
Section* Dbb::findSection(int32 sectionId)
{
+ ASSERT(sectionId != Section::INVALID_SECTION_ID);
+
int slot = sectionId % SECTION_HASH_SIZE;
Section *section;
=== modified file 'storage/falcon/MemMgr.cpp'
--- a/storage/falcon/MemMgr.cpp 2008-08-07 14:19:54 +0000
+++ b/storage/falcon/MemMgr.cpp 2008-08-11 16:17:26 +0000
@@ -72,8 +72,9 @@ static const int guardBytes = sizeof(lon
const int validateMinutia = 16;
// Nominal memory limits at startup--final values set during initialization
+bool memoryManagerAlive;
-static MemMgr memoryManager(defaultRounding, FREE_OBJECTS_SIZE, HEAP_SIZE);
+static MemMgr memoryManager(defaultRounding, FREE_OBJECTS_SIZE,
HEAP_SIZE,&memoryManagerAlive);
static MemMgr recordManager(defaultRounding, 2, HEAP_SIZE);
//static MemMgr recordObjectManager (defaultRounding, sizeof(RecordVersion) + 100,
HEAP_SIZE);
static MemControl memControl;
@@ -121,6 +122,9 @@ struct Client {
void* MemMgrAllocateDebug (unsigned int s, const char *file, int line)
{
+ if(!memoryManagerAlive)
+ return malloc(s);
+
void *object = memoryManager.allocateDebug(s, file, line);
if (object == stopAddress)
@@ -134,6 +138,11 @@ struct Client {
void MemMgrRelease (void *object)
{
+ if (!memoryManagerAlive)
+ {
+ free(object);
+ return;
+ }
/***
if (object == stopAddress)
printf ("MemMgrRelease at %p\n", stopAddress);
@@ -162,12 +171,18 @@ struct Client {
void* MemMgrAllocate (unsigned int s)
{
- return memoryManager.allocate (s);
+ if(!memoryManagerAlive)
+ return malloc(s);
+ else
+ return memoryManager.allocate (s);
}
void MemMgrRelease (void *object)
{
- memoryManager.release (object);
+ if(!memoryManagerAlive)
+ free(object);
+ else
+ memoryManager.release (object);
}
void* MemMgrRecordAllocate (int size, const char *file, int line)
@@ -269,7 +284,7 @@ void MemMgrLogDump()
}
-MemMgr::MemMgr(int rounding, int cutoff, int minAlloc)
+MemMgr::MemMgr(int rounding, int cutoff, int minAlloc, bool *alive)
{
signature = defaultSignature;
roundingSize = rounding;
@@ -293,6 +308,11 @@ MemMgr::MemMgr(int rounding, int cutoff,
//freeBlocks.nextLarger = freeBlocks.priorSmaller = &freeBlocks;
//freeBlockTree = NULL;
junk.larger = junk.smaller = &junk;
+ isAlive = alive;
+ if(alive)
+ {
+ *alive = true;
+ }
}
@@ -317,6 +337,8 @@ MemMgr::~MemMgr(void)
bigHunks = bigHunk->nextHunk;
releaseRaw (bigHunk);
}
+ if (isAlive)
+ *isAlive = false;
}
MemBlock* MemMgr::alloc(int length)
@@ -500,19 +522,11 @@ void* MemMgr::allocate(int size)
int length = ROUNDUP(size, roundingSize) + OFFSET(MemBlock*, body) + guardBytes;
MemBlock *memory;
- if (signature)
- {
- length = ROUNDUP(length, sizeof (double));
- memory = alloc (length);
- memory->pool = this;
- }
- else
- {
- length = ROUNDUP(size, defaultRounding) + OFFSET(MemBlock*, body) + sizeof(long);
- memory = (MemBlock*) allocRaw(length);
- memory->pool = NULL;
- memory->length = length;
- }
+ ASSERT(signature == defaultSignature);
+ length = ROUNDUP(length, sizeof (double));
+ memory = alloc (length);
+ memory->pool = this;
+
#ifdef MEM_DEBUG
memset (&memory->body, INIT_BYTE, size);
@@ -533,20 +547,11 @@ void* MemMgr::allocateDebug(int size, co
int length = ROUNDUP(size, roundingSize) + OFFSET(MemBlock*, body) + guardBytes;
MemBlock *memory;
- if (signature)
- {
- length = ROUNDUP(length, sizeof (double));
- memory = alloc (length);
- memory->pool = this;
- }
- else
- {
- length = ROUNDUP(size, defaultRounding) + OFFSET(MemBlock*, body) + sizeof(long);
- memory = (MemBlock*) allocRaw(length);
- memory->length = length;
- memory->pool = NULL;
+ ASSERT(signature == defaultSignature);
+ length = ROUNDUP(length, sizeof (double));
+ memory = alloc (length);
+ memory->pool = this;
memory->length = length;
- }
#ifdef MEM_DEBUG
memory->fileName = fileName;
=== modified file 'storage/falcon/MemMgr.h'
--- a/storage/falcon/MemMgr.h 2008-05-14 18:39:57 +0000
+++ b/storage/falcon/MemMgr.h 2008-08-06 11:53:21 +0000
@@ -106,7 +106,8 @@ public:
class MemMgr
{
public:
- MemMgr(int rounding=defaultRounding, int cutoff=defaultCutoff, int
minAllocation=defaultAllocation);
+ MemMgr(int rounding=defaultRounding, int cutoff=defaultCutoff,
+ int minAllocation=defaultAllocation, bool *alive = NULL);
MemMgr(void* arg1, void* arg2);
virtual ~MemMgr(void);
@@ -129,6 +130,7 @@ public:
uint64 activeMemory;
int blocksAllocated;
int blocksActive;
+ bool *isAlive;
friend void MemMgrLogDump();
=== modified file 'storage/falcon/Section.h'
--- a/storage/falcon/Section.h 2008-03-11 16:15:47 +0000
+++ b/storage/falcon/Section.h 2008-08-07 21:11:55 +0000
@@ -43,6 +43,7 @@ struct SectionAnalysis;
class Section
{
public:
+ static const int INVALID_SECTION_ID = -1;
void redoDataPage (int32 pageNumber, int32 locatorPageNumber);
Section(Dbb *dbb, int32 id, TransId transId);
virtual ~Section();
=== modified file 'storage/falcon/StorageHandler.cpp'
--- a/storage/falcon/StorageHandler.cpp 2008-07-31 08:52:32 +0000
+++ b/storage/falcon/StorageHandler.cpp 2008-08-07 21:11:55 +0000
@@ -488,9 +488,9 @@ int StorageHandler::createTablespace(con
TableSpaceManager *tableSpaceManager =
dictionaryConnection->database->tableSpaceManager;
- if (!tableSpaceManager->waitForPendingDrop(tableSpaceName, 10))
+ if (!tableSpaceManager->waitForPendingDrop(filename, 10))
// file still exists after waiting for 10 seconds
- return StorageErrorTableSpaceExist;
+ return StorageErrorTableSpaceDataFileExist;
try
{
=== modified file 'storage/falcon/StorageTable.cpp'
--- a/storage/falcon/StorageTable.cpp 2008-05-02 22:09:28 +0000
+++ b/storage/falcon/StorageTable.cpp 2008-08-04 15:53:52 +0000
@@ -56,8 +56,6 @@ StorageTable::StorageTable(StorageConnec
StorageTable::~StorageTable(void)
{
- clearTruncateLock();
-
if (bitmap)
((Bitmap*) bitmap)->release();
@@ -85,7 +83,6 @@ int StorageTable::open(void)
int StorageTable::deleteTable(void)
{
- clearTruncateLock();
int ret = share->deleteTable(storageConnection);
if (ret == 0)
@@ -96,32 +93,12 @@ int StorageTable::deleteTable(void)
int StorageTable::truncateTable(void)
{
- clearTruncateLock();
- Sync sync(share->syncTruncate, "StorageTable::truncateTable");
- sync.lock(Exclusive);
clearRecord();
int ret = share->truncateTable(storageConnection);
-
return ret;
}
-void StorageTable::clearTruncateLock(void)
-{
- if (haveTruncateLock)
- {
- share->clearTruncateLock();
- haveTruncateLock = false;
- }
-}
-void StorageTable::setTruncateLock()
-{
- if (!haveTruncateLock)
- {
- share->setTruncateLock();
- haveTruncateLock = true;
- }
-}
int StorageTable::insert(void)
{
=== modified file 'storage/falcon/StorageTable.h'
--- a/storage/falcon/StorageTable.h 2008-05-02 22:09:28 +0000
+++ b/storage/falcon/StorageTable.h 2008-08-04 15:53:52 +0000
@@ -64,8 +64,7 @@ public:
void clearAlter(void);
bool setAlter(void);
- void clearTruncateLock(void);
- void setTruncateLock();
+
virtual void setConnection(StorageConnection* connection);
virtual void clearIndexBounds(void);
=== modified file 'storage/falcon/StorageTableShare.cpp'
--- a/storage/falcon/StorageTableShare.cpp 2008-07-15 18:57:27 +0000
+++ b/storage/falcon/StorageTableShare.cpp 2008-08-04 15:53:52 +0000
@@ -70,10 +70,7 @@ StorageTableShare::StorageTableShare(Sto
sequence = NULL;
tempTable = tempTbl;
setPath(path);
- syncTruncate = new SyncObject;
- syncTruncate->setName("StorageTableShare::syncTruncate");
- truncateLockCount = 0;
-
+
if (tempTable)
tableSpace = TEMPORARY_TABLESPACE;
else if (tableSpaceName && tableSpaceName[0])
@@ -84,11 +81,7 @@ StorageTableShare::StorageTableShare(Sto
StorageTableShare::~StorageTableShare(void)
{
- while (truncateLockCount > 0)
- clearTruncateLock();
-
delete syncObject;
- delete syncTruncate;
delete [] impure;
if (storageDatabase)
@@ -605,21 +598,6 @@ JString StorageTableShare::lookupPathNam
return path;
}
-void StorageTableShare::setTruncateLock(void)
-{
- INTERLOCKED_INCREMENT(truncateLockCount);
- syncTruncate->lock(NULL, Shared);
-}
-
-void StorageTableShare::clearTruncateLock(void)
-{
- if (truncateLockCount > 0)
- {
- INTERLOCKED_DECREMENT(truncateLockCount);
- syncTruncate->unlock();
-// syncTruncate->unlock(NULL, Shared);
- }
-}
int StorageTableShare::getFieldId(const char* fieldName)
{
=== modified file 'storage/falcon/StorageTableShare.h'
--- a/storage/falcon/StorageTableShare.h 2008-07-09 04:38:02 +0000
+++ b/storage/falcon/StorageTableShare.h 2008-08-04 15:53:52 +0000
@@ -126,8 +126,6 @@ public:
uint64 estimateCardinality(void);
bool tableExists(void);
JString lookupPathName(void);
- void setTruncateLock(void);
- void clearTruncateLock(void);
static const char* getDefaultRoot(void);
static const char* cleanupTableName(const char* name, char* buffer, int bufferLength,
char *schema, int schemaLength);
@@ -142,7 +140,6 @@ public:
unsigned char *impure;
int initialized;
SyncObject *syncObject;
- SyncObject *syncTruncate;
StorageDatabase *storageDatabase;
StorageHandler *storageHandler;
Table *table;
@@ -150,7 +147,6 @@ public:
Sequence *sequence;
Format *format; // format for insertion
int numberIndexes;
- volatile INTERLOCK_TYPE truncateLockCount;
bool tempTable;
int getFieldId(const char* fieldName);
};
=== modified file 'storage/falcon/Table.cpp'
--- a/storage/falcon/Table.cpp 2008-08-01 17:56:28 +0000
+++ b/storage/falcon/Table.cpp 2008-08-07 21:11:55 +0000
@@ -794,8 +794,8 @@ void Table::init(int id, const char *sch
fields = NULL;
indexes = NULL;
fieldCount = 0;
- blobSectionId = 0;
- dataSectionId = 0;
+ blobSectionId = Section::INVALID_SECTION_ID;
+ dataSectionId = Section::INVALID_SECTION_ID;
blobSection = NULL;
dataSection = NULL;
backloggedRecords = NULL;
@@ -1371,7 +1371,7 @@ void Table::reIndexInversion(Transaction
bool Table::isCreated()
{
- return dataSectionId != 0;
+ return dataSectionId != Section::INVALID_SECTION_ID;
}
Index* Table::getPrimaryKey()
@@ -3232,13 +3232,17 @@ void Table::expunge(Transaction *transac
if (transaction)
transaction->hasUpdates = true;
- if (dataSectionId || blobSectionId)
+ if (dataSectionId != Section::INVALID_SECTION_ID)
{
dbb->deleteSection(dataSectionId, TRANSACTION_ID(transaction));
- dataSectionId = 0;
+ dataSectionId = Section::INVALID_SECTION_ID;
dataSection = NULL;
+ }
+
+ if (blobSectionId != Section::INVALID_SECTION_ID)
+ {
dbb->deleteSection(blobSectionId, TRANSACTION_ID(transaction));
- blobSectionId = 0;
+ blobSectionId = Section::INVALID_SECTION_ID;
blobSection = NULL;
}
}
@@ -3641,14 +3645,21 @@ Format* Table::getCurrentFormat(void)
void Table::findSections(void)
{
+ ASSERT(dataSectionId != Section::INVALID_SECTION_ID &&
+ blobSectionId != Section::INVALID_SECTION_ID);
+
if (!dataSection)
{
dataSection = dbb->findSection(dataSectionId);
dataSection->table = this;
}
+ ASSERT(dataSection->sectionId == dataSectionId);
if (!blobSection)
+ {
blobSection = dbb->findSection(blobSectionId);
+ }
+ ASSERT(blobSection->sectionId == blobSectionId);
}
bool Table::validateUpdate(int32 recordNumber, TransId transactionId)
=== modified file 'storage/falcon/ha_falcon.cpp'
--- a/storage/falcon/ha_falcon.cpp 2008-08-07 14:19:54 +0000
+++ b/storage/falcon/ha_falcon.cpp 2008-08-11 16:17:26 +0000
@@ -420,9 +420,6 @@ StorageInterface::StorageInterface(handl
StorageInterface::~StorageInterface(void)
{
- if (storageTable)
- storageTable->clearTruncateLock();
-
if (activeBlobs)
freeActiveBlobs();
@@ -534,10 +531,6 @@ StorageConnection* StorageInterface::get
int StorageInterface::close(void)
{
DBUG_ENTER("StorageInterface::close");
-
- if (storageTable)
- storageTable->clearTruncateLock();
-
unmapFields();
// Temporarily comment out DTrace probes in Falcon, see bug #36403
@@ -917,7 +910,9 @@ THR_LOCK_DATA **StorageInterface::store_
if ( (lock_type >= TL_WRITE_CONCURRENT_INSERT && lock_type <=
TL_WRITE)
&& !(thd_in_lock_tables(thd) && sql_command == SQLCOM_LOCK_TABLES)
&& !(thd_tablespace_op(thd))
- // && (sql_command != SQLCOM_TRUNCATE)
+ && (sql_command != SQLCOM_ALTER_TABLE)
+ && (sql_command != SQLCOM_DROP_TABLE)
+ && (sql_command != SQLCOM_TRUNCATE)
&& (sql_command != SQLCOM_OPTIMIZE)
&& (sql_command != SQLCOM_CREATE_TABLE)
)
@@ -1020,7 +1015,7 @@ int StorageInterface::delete_all_rows()
if (!storageTable)
storageTable = storageConnection->getStorageTable(storageShare);
- storageTable->truncateTable();
+ ret = storageTable->truncateTable();
DBUG_RETURN(ret);
}
@@ -1262,10 +1257,6 @@ void StorageInterface::startTransaction(
if (!storageConnection->transactionActive)
{
storageConnection->startTransaction(isolation);
-
- if (storageTable)
- storageTable->setTruncateLock();
-
trans_register_ha(mySqlThread, true, falcon_hton);
}
@@ -1873,12 +1864,7 @@ int StorageInterface::external_lock(THD
storageConnection->setCurrentStatement(NULL);
if (!thd_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))
- {
- if (storageTable)
- storageTable->clearTruncateLock();
-
storageConnection->endImplicitTransaction();
- }
else
storageConnection->releaseVerb();
@@ -1891,10 +1877,11 @@ int StorageInterface::external_lock(THD
storageConnection->setCurrentStatement(thd->query);
insertCount = 0;
- bool isTruncate = false;
-
+
switch (thd_sql_command(thd))
{
+ case SQLCOM_TRUNCATE:
+ case SQLCOM_DROP_TABLE:
case SQLCOM_ALTER_TABLE:
case SQLCOM_DROP_INDEX:
case SQLCOM_CREATE_INDEX:
@@ -1903,18 +1890,10 @@ int StorageInterface::external_lock(THD
if (ret)
{
- if (storageTable)
- storageTable->clearTruncateLock();
-
DBUG_RETURN(error(ret));
}
}
break;
-
- case SQLCOM_TRUNCATE:
- isTruncate = true;
- break;
-
default:
break;
}
@@ -1927,9 +1906,6 @@ int StorageInterface::external_lock(THD
if (storageConnection->startTransaction(isolation))
{
- if (!isTruncate && storageTable)
- storageTable->setTruncateLock();
-
trans_register_ha(thd, true, falcon_hton);
}
@@ -1942,9 +1918,6 @@ int StorageInterface::external_lock(THD
if (storageConnection->startImplicitTransaction(isolation))
{
- if (!isTruncate && storageTable)
- storageTable->setTruncateLock();
-
trans_register_ha(thd, false, falcon_hton);
}
}
| Thread | ||
|---|---|---|
| • bzr push into mysql-6.0-falcon branch (vvaintroub:2772) | Vladislav Vaintroub | 11 Aug |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.815 sec. using MySQL 5.1.14-beta-log