| List: | Commits | « Previous MessageNext Message » | |
| From: | Narayanan V | Date: | August 20 2008 10:08am |
| Subject: | bzr push into mysql-6.0-sea branch (v.narayanan:2693 to 2773) Bug#16902, Bug#28309, Bug#34286, Bug#36403, Bug#36468, Bug#36700, Bug#36745, Bug#36825,... | ||
| View as plain text | |||
2773 Narayanan V 2008-08-20 [merge]
WL#4380
Merging mysql-5.1-sea -> mysql-6.0-sea
modified:
Makefile.am
configure.in
2772 Narayanan V 2008-08-20 [merge]
WL#4380 abi_check rule (using gcc -E) for storage engine API
Merging mysql-6.0 -> mysql-6.0-sea
removed:
include/mysql_h.ic
added:
include/mysql.h.pp
include/mysql/plugin.h.pp
sql/mysql_priv.h.pp
modified:
.bzr-mysql/default.conf
Makefile.am
configure.in
include/Makefile.am
sql/ha_ndbcluster.cc
sql/handler.h
sql/sql_insert.cc
sql/sql_show.cc
sql/table.h
2771 Sven Sandberg 2008-08-18
empty commit to force pushbuild to rebuild
2770 Sven Sandberg 2008-08-18 [merge]
merge 6.0-rpl-testfixes -> 6.0
The following conflicts were resolved manually:
Path conflict: <deleted> /
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt
Conflict adding file mysql-test/t/innodb_bug35220.test. Moved existing file to
mysql-test/t/innodb_bug35220.test.moved.
removed:
mysql-test/t/innodb_bug35220.test
added:
mysql-test/t/innodb_bug35220.test
2769 Sven Sandberg 2008-08-18 [merge]
Merge 5.1 main -> 6.0 main.
The following conflicts were resolved manually:
Conflict adding file mysql-test/r/innodb_bug35220.result. Moved existing file to
mysql-test/r/innodb_bug35220.result.moved.
Text conflict in mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
Text conflict in mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
Text conflict in mysql-test/suite/rpl/t/rpl_loaddata_map.test
Path conflict: mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt /
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt
Conflict adding file mysql-test/t/innodb_bug35220.test. Moved existing file to
mysql-test/t/innodb_bug35220.test.moved.
Text conflict in tests/mysql_client_test.c
removed:
mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt
mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt
mysql-test/t/innodb_bug35220.test
added:
mysql-test/t/innodb_bug35220.test
modified:
mysql-test/extra/binlog_tests/binlog_insert_delayed.test
mysql-test/extra/rpl_tests/rpl_row_basic.test
mysql-test/include/show_binlog_events.inc
mysql-test/suite/binlog/r/binlog_killed_simulate.result
mysql-test/suite/binlog/r/binlog_row_binlog.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_mix_innodb_myisam.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_stm_log.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_trunc_temp.test
mysql-test/suite/rpl/t/rpl_variables.test
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test
mysql-test/suite/rpl_ndb_big/r/rpl_row_basic_7ndb.result
sql/sql_binlog.cc
sql/sql_cursor.cc
tests/mysql_client_test.c
2768 Timothy Smith 2008-08-13
Up-merge from 5.1 (test case for bug 34286, no code changes)
added:
mysql-test/r/innodb-autoinc-optimize.result
mysql-test/t/innodb-autoinc-optimize.test
2767 Timothy Smith 2008-08-13
Cherry-pick null merge revision from 5.1
2766 Timothy Smith 2008-08-13 [merge]
Merge in NULL innodb merge. (No changes)
2765 Davi Arnaut 2008-08-12 [merge]
Merge mysql-6.0-bugteam into mysql-6.0 main.
removed:
mysql-test/include/wait_timeout_basic.inc
added:
mysql-test/include/have_nodebug.inc
mysql-test/r/have_nodebug.require
mysql-test/r/sp-no-code.result
mysql-test/suite/sys_vars/inc/multi_range_count_basic.inc
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/t/multi_range_count_basic_32.test
mysql-test/suite/sys_vars/t/multi_range_count_basic_64.test
mysql-test/t/sp-no-code.test
modified:
client/Makefile.am
client/mysql_upgrade.c
client/mysqltest.c
config/ac-macros/character_sets.m4
configure.in
extra/comp_err.c
extra/perror.c
mysql-test/r/func_if.result
mysql-test/r/perror.result
mysql-test/r/subselect.result
mysql-test/r/subselect_no_mat.result
mysql-test/r/subselect_no_opts.result
mysql-test/r/subselect_no_semijoin.result
mysql-test/suite/funcs_1/r/falcon_storedproc.result
mysql-test/suite/funcs_1/r/falcon_trig_03.result
mysql-test/suite/funcs_1/r/falcon_trig_03e.result
mysql-test/suite/funcs_1/r/innodb_storedproc.result
mysql-test/suite/funcs_1/r/innodb_trig_03.result
mysql-test/suite/funcs_1/r/innodb_trig_03e.result
mysql-test/suite/funcs_1/r/is_columns_mysql.result
mysql-test/suite/funcs_1/r/is_user_privileges.result
mysql-test/suite/funcs_1/r/memory_storedproc.result
mysql-test/suite/funcs_1/r/memory_trig_03.result
mysql-test/suite/funcs_1/r/memory_trig_03e.result
mysql-test/suite/funcs_1/r/myisam_storedproc.result
mysql-test/suite/funcs_1/r/myisam_trig_03.result
mysql-test/suite/funcs_1/r/myisam_trig_03e.result
mysql-test/suite/funcs_1/r/ndb_storedproc.result
mysql-test/suite/funcs_1/r/ndb_trig_03.result
mysql-test/suite/funcs_1/r/ndb_trig_03e.result
mysql-test/suite/funcs_1/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/ndb/r/ndb_basic.result
mysql-test/suite/ndb/t/disabled.def
mysql-test/suite/rpl/t/disabled.def
mysql-test/t/func_if.test
mysql-test/t/perror.test
mysql-test/t/subselect.test
scripts/mysql_system_tables_fix.sql
sql/field.h
sql/item.cc
sql/item.h
sql/item_cmpfunc.cc
sql/item_func.cc
sql/mysql_priv.h
sql/share/errmsg.txt
sql/sp_head.cc
sql/sql_acl.cc
sql/sql_base.cc
sql/sql_error.cc
sql/sql_error.h
sql/sql_lex.h
sql/sql_list.h
sql/sql_parse.cc
sql/sql_select.cc
sql/sql_string.h
sql/sql_yacc.yy
sql/table.cc
sql/table.h
sql/thr_malloc.cc
support-files/build-tags
2764 John H. Embretsen 2008-08-08
Post merge fix (6.0-falcon --> 6.0), fixed bzr tree info
modified:
.bzr-mysql/default.conf
2763 John H. Embretsen 2008-08-07 [merge]
Merge 6.0 --> 6.0-falcon
modified:
include/my_handler.h
include/my_sys.h
include/myisam.h
include/myisamchk.h
mysql-test/mysql-test-run.pl
mysql-test/r/ctype_ldml.result
mysql-test/std_data/Index.xml
mysql-test/t/ctype_ldml.test
mysys/charset.c
sql/probes.h
sql/sql_show.cc
sql/table.cc
sql/unireg.cc
storage/falcon/Makefile.am
storage/falcon/MemMgr.cpp
storage/myisam/ft_static.c
storage/myisam/mi_open.c
strings/conf_to_src.c
2762 John H. Embretsen 2008-08-05 [merge]
Merge of 6.0 --> 6.0-falcon.
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
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/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_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/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_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/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/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
storage/myisammrg/ha_myisammrg.cc
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
2761 Vladislav Vaintroub 2008-08-04 [merge]
(no message)
added:
mysql-test/suite/falcon/r/falcon_bug_35939.result
mysql-test/suite/falcon/t/falcon_bug_35939.test
modified:
mysql-test/mysql-test-run.pl
mysql-test/suite/falcon/r/falcon_bug_22161.result
mysql-test/suite/falcon/r/falcon_bug_31295.result
mysql-test/suite/falcon/r/falcon_bug_33404.result
mysql-test/suite/falcon/t/falcon_bug_22161.test
mysql-test/suite/falcon/t/falcon_bug_31295.test
mysql-test/suite/falcon/t/falcon_bug_33404.test
mysql-test/suite/funcs_1/r/is_columns_is_falcon.result
mysql-test/suite/funcs_1/r/is_tables_is_falcon.result
mysql-test/t/information_schema-master.opt
mysql-test/t/information_schema_db-master.opt
mysql-test/t/mysqlshow-master.opt
mysql-test/t/variables-master.opt
storage/falcon/BDB.cpp
storage/falcon/BDB.h
storage/falcon/Cache.cpp
storage/falcon/CollationManager.cpp
storage/falcon/CompiledStatement.cpp
storage/falcon/Connection.cpp
storage/falcon/DatabaseCopy.cpp
storage/falcon/Dbb.cpp
storage/falcon/Dbb.h
storage/falcon/DeferredIndex.cpp
storage/falcon/DeferredIndex.h
storage/falcon/IO.cpp
storage/falcon/Index.cpp
storage/falcon/IndexWalker.cpp
storage/falcon/IndexWalker.h
storage/falcon/Inversion.cpp
storage/falcon/Makefile.am
storage/falcon/MemMgr.cpp
storage/falcon/RecoveryObjects.cpp
storage/falcon/RecoveryObjects.h
storage/falcon/Repository.cpp
storage/falcon/RepositoryManager.cpp
storage/falcon/RepositoryVolume.cpp
storage/falcon/ResultSet.cpp
storage/falcon/Role.cpp
storage/falcon/SRLPrepare.cpp
storage/falcon/SRLRollback.cpp
storage/falcon/Scheduler.cpp
storage/falcon/SectorBuffer.cpp
storage/falcon/SectorCache.cpp
storage/falcon/SequenceManager.cpp
storage/falcon/SerialLog.cpp
storage/falcon/SerialLog.h
storage/falcon/Server.cpp
storage/falcon/Statement.cpp
storage/falcon/StorageDatabase.cpp
storage/falcon/StorageDatabase.h
storage/falcon/StorageHandler.cpp
storage/falcon/StorageHandler.h
storage/falcon/SymbolManager.cpp
storage/falcon/Sync.cpp
storage/falcon/Sync.h
storage/falcon/SyncObject.cpp
storage/falcon/SyncObject.h
storage/falcon/Table.cpp
storage/falcon/TableSpaceManager.cpp
storage/falcon/Thread.cpp
storage/falcon/Threads.cpp
storage/falcon/Transaction.cpp
storage/falcon/Transaction.h
storage/falcon/TransactionManager.cpp
storage/falcon/WalkDeferred.cpp
storage/falcon/WalkDeferred.h
storage/falcon/ha_falcon.cpp
storage/falcon/ha_falcon.h
2760 Hakan Kuecuekyilmaz 2008-07-25
Make mysql-test-run.pl executable again.
modified:
mysql-test/mysql-test-run.pl*
2759 John H. Embretsen 2008-07-24 [merge]
6.0 -> 6.0-falcon merge (mostly maria changes)
removed:
mysql-test/r/maria3.result
mysql-test/t/maria3.test
added:
mysql-test/r/maria-autozerofill.result
mysql-test/r/maria-big2.result
mysql-test/r/maria3.result
mysql-test/t/maria-autozerofill.test
mysql-test/t/maria-big2.test
mysql-test/t/maria3.test
modified:
client/client_priv.h
client/mysql.cc
client/mysqltest.c
mysql-test/include/query_prealloc_size_basic.inc
mysql-test/include/transaction_prealloc_size_basic.inc
mysql-test/r/maria-mvcc.result
mysql-test/r/maria-preload.result
mysql-test/r/maria.result
mysql-test/r/query_prealloc_size_basic_32.result
mysql-test/r/query_prealloc_size_basic_64.result
mysql-test/r/transaction_prealloc_size_basic_32.result
mysql-test/r/transaction_prealloc_size_basic_64.result
mysql-test/suite/funcs_1/r/processlist_priv_ps.result
mysql-test/suite/funcs_1/r/processlist_val_ps.result
mysql-test/t/disabled.def
mysql-test/t/maria-mvcc.test
mysql-test/t/maria-preload.test
mysql-test/t/maria.test
sql/field.cc
sql/sql_class.cc
sql/sql_parse.cc
storage/maria/KNOWN_BUGS.txt
storage/maria/ha_maria.cc
storage/maria/ha_maria.h
storage/maria/ma_blockrec.c
storage/maria/ma_check.c
storage/maria/ma_checkpoint.c
storage/maria/ma_close.c
storage/maria/ma_create.c
storage/maria/ma_delete.c
storage/maria/ma_key_recover.c
storage/maria/ma_locking.c
storage/maria/ma_loghandler.c
storage/maria/ma_loghandler.h
storage/maria/ma_loghandler_lsn.h
storage/maria/ma_open.c
storage/maria/ma_recovery.c
storage/maria/ma_search.c
storage/maria/ma_state.c
storage/maria/ma_state.h
storage/maria/ma_test_force_start.pl
storage/maria/ma_write.c
storage/maria/maria_chk.c
storage/maria/maria_pack.c
storage/maria/trnman.c
storage/maria/trnman_public.h
storage/maria/unittest/ma_test_recovery.pl
2758 Hakan Kuecuekyilmaz 2008-07-21 [merge]
Merge.
removed:
mysql-test/extra/binlog_tests/implicit.test
mysql-test/r/parser.result
mysql-test/suite/binlog/r/binlog_implicit_commit.result
mysql-test/suite/binlog/t/binlog_implicit_commit.test
mysql-test/suite/falcon/r/rpl_falcon_bug_37221.result
mysql-test/suite/falcon/t/rpl_falcon_bug_37221.test
mysql-test/t/parser.test
added:
mysql-test/extra/binlog_tests/implicit.test
mysql-test/r/parser.result
mysql-test/suite/binlog/r/binlog_implicit_commit.result
mysql-test/suite/binlog/t/binlog_implicit_commit.test
mysql-test/suite/falcon/r/rpl_falcon_bug_37221.result
mysql-test/suite/falcon/t/rpl_falcon_bug_37221.test
mysql-test/t/parser.test
modified:
client/mysql.cc
include/my_sys.h
mysql-test/mysql-test-run.pl*
mysql-test/r/mysql.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/t/mysql_delimiter.sql
mysql-test/t/system_mysql_db_fix50030.test
mysql-test/t/system_mysql_db_fix50117.test
mysys/default.c
mysys/mf_pack.c
scripts/make_binary_distribution.sh
sql/backup/api_types.h
sql/backup/backup_engine.h
sql/backup/backup_test.cc
sql/backup/be_nodata.h
sql/backup/data_backup.cc
sql/backup/kernel.cc
sql/backup/stream_v1.c
sql/backup/stream_v1_transport.c
sql/hostname.cc
sql/mysql_priv.h
sql/mysqld.cc
storage/archive/azio.h
storage/falcon/ha_falcon.cpp
storage/innobase/include/univ.i
storage/myisam/myisam_backup_engine.cc
support-files/my-huge.cnf.sh
support-files/my-large.cnf.sh
support-files/my-medium.cnf.sh
2757 lars-erik.bjork@stripped 2008-07-18 [merge]
Merging ...
modified:
configure.in
mysql-test/suite/rpl/t/disabled.def
storage/falcon/IOx.h
storage/falcon/StorageHandler.cpp
storage/falcon/TableSpaceManager.cpp
storage/falcon/TableSpaceManager.h
2756 lars-erik.bjork@stripped 2008-07-17
bug#36990 - Remove unsupported 'create tablespace' parameters and
falcon_initial_allocation
* Removed all usage of falcon_initial_allocation
* Removed all usage of unsupported and NDB only parameters to 'create tablespace'
statement
* Updated test falcon_options and falcon_options2 to reflect the changes
modified:
mysql-test/suite/falcon/r/falcon_options.result
mysql-test/suite/falcon/r/falcon_options2.result
mysql-test/suite/falcon/t/falcon_options2.test
storage/falcon/BackLog.cpp
storage/falcon/Configuration.cpp
storage/falcon/Configuration.h
storage/falcon/Database.cpp
storage/falcon/DatabaseClone.cpp
storage/falcon/Dbb.cpp
storage/falcon/Dbb.h
storage/falcon/IO.cpp
storage/falcon/IOx.h
storage/falcon/RepositoryVolume.cpp
storage/falcon/SQLParse.cpp
storage/falcon/SRLCreateTableSpace.cpp
storage/falcon/SRLCreateTableSpace.h
storage/falcon/Statement.cpp
storage/falcon/StorageHandler.cpp
storage/falcon/StorageHandler.h
storage/falcon/TableSpace.cpp
storage/falcon/TableSpace.h
storage/falcon/TableSpaceManager.cpp
storage/falcon/ha_falcon.cpp
2755 Hakan Kuecuekyilmaz 2008-07-16
Rescued another test from falcon_team graveyard.
Project code name: make Vlad happy.
renamed:
mysql-test/suite/falcon_team/r/falcon_bug_37080.result =>
mysql-test/suite/falcon/r/falcon_bug_37080.result
mysql-test/suite/falcon_team/t/falcon_bug_37080.test =>
mysql-test/suite/falcon/t/falcon_bug_37080.test
modified:
mysql-test/suite/falcon/r/falcon_bug_37080.result
mysql-test/suite/falcon/t/falcon_bug_37080.test
2754 Hakan Kuecuekyilmaz 2008-07-16
Rescued another test from falcon_team graveyard.
Project code name: make Vlad happy.
renamed:
mysql-test/suite/falcon_team/r/falcon_bug_27997.result =>
mysql-test/suite/falcon/r/falcon_bug_27997.result
mysql-test/suite/falcon_team/t/falcon_bug_27997.test =>
mysql-test/suite/falcon/t/falcon_bug_27997.test
2753 Hakan Kuecuekyilmaz 2008-07-16 [merge]
Merge.
added:
mysql-test/suite/falcon/r/falcon_bug_38039.result
mysql-test/suite/falcon/t/falcon_bug_38039.test
2752 Hakan Kuecuekyilmaz 2008-07-16
Rescued another test from falcon_team graveyard.
Project code name: make Vlad happy.
renamed:
mysql-test/suite/falcon_team/r/falcon_bug_23962.result =>
mysql-test/suite/falcon/r/falcon_bug_23962.result
mysql-test/suite/falcon_team/t/falcon_bug_23962.test =>
mysql-test/suite/falcon/t/falcon_bug_23962.test
modified:
mysql-test/suite/falcon/r/falcon_bug_23962.result
mysql-test/suite/falcon/t/falcon_bug_23962.test
2751 Hakan Kuecuekyilmaz 2008-07-16
After merge fix.
modified:
.bzr-mysql/default.conf
2750 Hakan Kuecuekyilmaz 2008-07-16 [merge]
Merge.
removed:
mysql-test/r/merge-big.result
mysql-test/t/merge-big.test
sql/backup/debug.h
added:
mysql-test/include/ctype_ascii_order.inc
mysql-test/include/have_debug_sync.inc
mysql-test/r/backup_charsets.result
mysql-test/r/backup_commit_restore.result
mysql-test/r/backup_compression.result
mysql-test/r/backup_lock_myisam.result
mysql-test/r/backup_many_dbs.result
mysql-test/r/backup_multi_blocks.result
mysql-test/r/backup_myisam1.result
mysql-test/r/backup_myisam2.result
mysql-test/r/backup_no_be.result
mysql-test/r/backup_nodata_driver.result
mysql-test/r/backup_procedures.result
mysql-test/r/backup_triggers_and_events.result
mysql-test/r/backup_view_on_view.result
mysql-test/r/backup_views.result
mysql-test/r/ctype_cp866.result
mysql-test/r/debug_sync.result
mysql-test/r/have_debug_sync.require
mysql-test/r/merge-sync.result
mysql-test/r/myisamlog.result
mysql-test/suite/backup/
mysql-test/suite/backup/r/
mysql-test/suite/backup/r/backup_online_testing.result
mysql-test/suite/backup/t/
mysql-test/suite/backup/t/backup_online_testing.test
mysql-test/t/backup_charsets.test
mysql-test/t/backup_commit_restore.test
mysql-test/t/backup_compression.test
mysql-test/t/backup_lock_myisam.test
mysql-test/t/backup_many_dbs.test
mysql-test/t/backup_multi_blocks.test
mysql-test/t/backup_myisam1-master.opt
mysql-test/t/backup_myisam1.test
mysql-test/t/backup_myisam2.test
mysql-test/t/backup_no_be.test
mysql-test/t/backup_nodata_driver.test
mysql-test/t/backup_procedures.test
mysql-test/t/backup_triggers_and_events.test
mysql-test/t/backup_view_on_view.test
mysql-test/t/backup_views.test
mysql-test/t/ctype_cp866.test
mysql-test/t/debug_sync.test
mysql-test/t/merge-sync.test
mysql-test/t/myisamlog-master.opt
mysql-test/t/myisamlog.test
sql/backup/backup_info.cc
sql/backup/backup_info.h
sql/backup/be_logical.h
sql/backup/be_nodata.cc
sql/backup/be_nodata.h
sql/backup/restore_info.h
sql/debug_sync.cc
storage/myisam/mi_examine_log.c
storage/myisam/myisam_backup_engine.cc
renamed:
sql/backup/catalog.cc => sql/backup/image_info.cc
sql/backup/catalog.h => sql/backup/image_info.h
modified:
.bzr-mysql/default.conf
.bzrignore
CMakeLists.txt*
client/mysqltest.c
configure.in
dbug/CMakeLists.txt*
include/atomic/generic-msvc.h
include/atomic/nolock.h
include/config-win.h
include/keycache.h
include/my_global.h
include/my_sys.h
include/myisam.h
libmysqld/CMakeLists.txt
libmysqld/Makefile.am
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
mysql-test/lib/mtr_report.pl
mysql-test/mysql-test-run.pl
mysql-test/r/backup.result
mysql-test/r/backup_commit_blocker.result
mysql-test/r/backup_ddl_blocker.result
mysql-test/r/backup_errors.result
mysql-test/r/backup_objects.result
mysql-test/r/backup_progress.result
mysql-test/r/backup_snapshot.result
mysql-test/r/character_set_server_func.result
mysql-test/r/ctype_big5.result
mysql-test/r/ctype_gb2312.result
mysql-test/r/ctype_gbk.result
mysql-test/r/ctype_tis620.result
mysql-test/r/ctype_utf32.result
mysql-test/r/ctype_utf8.result
mysql-test/r/fulltext2.result
mysql-test/r/merge.result
mysql-test/r/xml.result
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
mysql-test/suite/falcon/r/falcon_bug_32833.result
mysql-test/suite/funcs_1/r/is_columns_mysql.result
mysql-test/t/backup.test
mysql-test/t/backup_commit_blocker.test
mysql-test/t/backup_ddl_blocker.test
mysql-test/t/backup_errors.test
mysql-test/t/backup_objects.test
mysql-test/t/backup_progress.test
mysql-test/t/backup_security.test
mysql-test/t/backup_snapshot.test
mysql-test/t/character_set_server_func.test
mysql-test/t/ctype_big5.test
mysql-test/t/ctype_gb2312.test
mysql-test/t/ctype_gbk.test
mysql-test/t/ctype_tis620.test
mysql-test/t/ctype_utf32.test
mysql-test/t/ctype_utf8.test
mysql-test/t/disabled.def
mysql-test/t/fulltext2.test
mysql-test/t/innodb-autoinc.test
mysql-test/t/key_cache.test
mysql-test/t/merge.test
mysql-test/t/xml.test
mysql-test/valgrind.supp
mysys/CMakeLists.txt
mysys/mf_iocache.c
mysys/mf_keycache.c
mysys/my_thr_init.c
mysys/thr_lock.c
scripts/mysql_system_tables.sql
sql/CMakeLists.txt
sql/Makefile.am
sql/backup/CMakeLists.txt
sql/backup/Makefile.am
sql/backup/api_types.h
sql/backup/backup_aux.h
sql/backup/backup_engine.h
sql/backup/backup_kernel.h
sql/backup/backup_progress.cc
sql/backup/backup_progress.h
sql/backup/backup_stream.h
sql/backup/backup_test.cc
sql/backup/be_default.cc
sql/backup/be_default.h
sql/backup/be_native.h
sql/backup/be_snapshot.cc
sql/backup/be_snapshot.h
sql/backup/be_thread.cc
sql/backup/be_thread.h
sql/backup/buffer_iterator.cc
sql/backup/buffer_iterator.h
sql/backup/data_backup.cc
sql/backup/kernel.cc
sql/backup/logger.cc
sql/backup/logger.h
sql/backup/stream.cc
sql/backup/stream.h
sql/backup/stream_services.h
sql/backup/stream_v1.c
sql/backup/stream_v1.h
sql/backup/stream_v1_transport.c
sql/ddl_blocker.cc
sql/ddl_blocker.h
sql/handler.cc
sql/item.cc
sql/item_func.cc
sql/item_xmlfunc.cc
sql/lex.h
sql/lock.cc
sql/mysql_priv.h
sql/mysqld.cc
sql/set_var.cc
sql/set_var.h
sql/share/charsets/cp866.xml
sql/share/errmsg.txt
sql/si_objects.cc
sql/si_objects.h
sql/sql_array.h
sql/sql_base.cc
sql/sql_bitmap.h
sql/sql_cache.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_delete.cc
sql/sql_insert.cc
sql/sql_lex.h
sql/sql_load.cc
sql/sql_parse.cc
sql/sql_repl.cc
sql/sql_repl.h
sql/sql_string.cc
sql/sql_table.cc
sql/sql_yacc.yy
storage/myisam/CMakeLists.txt
storage/myisam/Makefile.am
storage/myisam/ft_parser.c
storage/myisam/ft_update.c
storage/myisam/ftdefs.h
storage/myisam/ha_myisam.cc
storage/myisam/ha_myisam.h
storage/myisam/mi_check.c
storage/myisam/mi_close.c
storage/myisam/mi_create.c
storage/myisam/mi_delete.c
storage/myisam/mi_delete_all.c
storage/myisam/mi_dynrec.c
storage/myisam/mi_extra.c
storage/myisam/mi_locking.c
storage/myisam/mi_log.c
storage/myisam/mi_open.c
storage/myisam/mi_page.c
storage/myisam/mi_panic.c
storage/myisam/mi_rrnd.c
storage/myisam/mi_static.c
storage/myisam/mi_test2.c
storage/myisam/mi_test3.c
storage/myisam/mi_test_all.sh
storage/myisam/mi_update.c
storage/myisam/mi_write.c
storage/myisam/myisam_ftdump.c
storage/myisam/myisamchk.c
storage/myisam/myisamdef.h
storage/myisam/myisamlog.c
storage/myisam/myisampack.c
storage/myisammrg/ha_myisammrg.cc
storage/myisammrg/myrg_info.c
storage/myisammrg/myrg_open.c
storage/myisammrg/myrg_queue.c
storage/myisammrg/myrg_rrnd.c
strings/ctype-big5.c
strings/ctype-extra.c
strings/ctype-gb2312.c
strings/ctype-gbk.c
strings/ctype-ucs2.c
strings/ctype-utf8.c
win/configure.js
sql/backup/image_info.cc
sql/backup/image_info.h
2749 Kevin Lewis 2008-07-15
Cleanup code. Some white space cleanup, but mostly making the
text identifiers for Sync constructors accurate and unique.
Alo comment out debug calls to validate in WalkIndex.cpp
2748 Kevin Lewis 2008-07-15
Cleanup code. Some white space cleanup, but mostly making the
text identifiers for Sync constructors accurate and unique.
Alo comment out debug calls to validate in WalkIndex.cpp
modified:
storage/falcon/Cache.cpp
storage/falcon/CollationManager.cpp
storage/falcon/CompiledStatement.cpp
storage/falcon/Connection.cpp
storage/falcon/Database.cpp
storage/falcon/DatabaseClone.cpp
storage/falcon/Dbb.cpp
storage/falcon/DeferredIndex.cpp
storage/falcon/Gopher.cpp
storage/falcon/Index.cpp
storage/falcon/IndexWalker.cpp
storage/falcon/LicenseManager.cpp
storage/falcon/RecordLeaf.cpp
storage/falcon/RecordVersion.cpp
storage/falcon/Repository.cpp
storage/falcon/RepositoryManager.cpp
storage/falcon/RepositoryVolume.cpp
storage/falcon/SRLDeleteIndex.cpp
storage/falcon/SRLUpdateIndex.cpp
storage/falcon/Scheduler.cpp
storage/falcon/SectorCache.cpp
storage/falcon/SerialLog.cpp
storage/falcon/SerialLogFile.cpp
storage/falcon/SessionManager.cpp
storage/falcon/Statement.cpp
storage/falcon/StorageDatabase.cpp
storage/falcon/StorageHandler.cpp
storage/falcon/StorageTableShare.cpp
storage/falcon/SymbolManager.cpp
storage/falcon/Sync.h
storage/falcon/SyncTest.cpp
storage/falcon/Table.cpp
storage/falcon/TableSpaceManager.cpp
storage/falcon/Transaction.cpp
storage/falcon/TransactionManager.cpp
storage/falcon/WalkIndex.cpp
2747 Hakan Kuecuekyilmaz 2008-07-14 [merge]
Merge.
modified:
mysql-test/suite/parts/t/disabled.def
mysql-test/suite/rpl/t/disabled.def
2746 Hakan Kuecuekyilmaz 2008-07-14 [merge]
Merge.
modified:
storage/falcon/IndexWalker.cpp
storage/falcon/WalkDeferred.cpp
2745 Hakan Kuecuekyilmaz 2008-07-14
Moved out falcon_bug_28048.test to falcon_team suite due to Bug#36700.
renamed:
mysql-test/suite/falcon/r/falcon_bug_28048.result =>
mysql-test/suite/falcon_team/r/falcon_bug_28048.result
mysql-test/suite/falcon/t/falcon_bug_28048.test =>
mysql-test/suite/falcon_team/t/falcon_bug_28048.test
modified:
mysql-test/suite/falcon_team/r/falcon_bug_28048.result
mysql-test/suite/falcon_team/t/falcon_bug_28048.test
2744 Hakan Kuecuekyilmaz 2008-07-14 [merge]
Merge.
removed:
mysql-test/suite/parts/r/ndb_blob_partition.result
mysql-test/suite/parts/r/ndb_partition_error.result
mysql-test/suite/parts/r/ndb_partition_key.result
mysql-test/suite/parts/r/ndb_partition_list.result
mysql-test/suite/parts/r/ndb_partition_range.result
mysql-test/suite/parts/r/rpl_ndb_dd_partitions.result
mysql-test/suite/parts/t/ndb_blob_partition.test
mysql-test/suite/parts/t/ndb_partition_error.test
mysql-test/suite/parts/t/ndb_partition_key.test
mysql-test/suite/parts/t/ndb_partition_list.test
mysql-test/suite/parts/t/ndb_partition_range.test
mysql-test/suite/parts/t/rpl_ndb_dd_partitions.test
added:
mysql-test/r/subselect_debug.result
mysql-test/suite/bugs/combinations
mysql-test/suite/bugs/r/rpl_bug37426.result
mysql-test/suite/bugs/t/rpl_bug37426.test
mysql-test/t/subselect_debug.test
modified:
client/mysqltest.c
mysql-test/extra/rpl_tests/rpl_row_basic.test
mysql-test/include/have_big5.inc
mysql-test/include/have_binlog_format_mixed.inc
mysql-test/include/have_binlog_format_mixed_or_row.inc
mysql-test/include/have_binlog_format_mixed_or_statement.inc
mysql-test/include/have_binlog_format_row.inc
mysql-test/include/have_binlog_format_row_or_statement.inc
mysql-test/include/have_binlog_format_statement.inc
mysql-test/include/have_bug25714.inc
mysql-test/include/have_case_sensitive_file_system.inc
mysql-test/include/have_community_features.inc
mysql-test/include/have_compress.inc
mysql-test/include/have_cp1250_ch.inc
mysql-test/include/have_cp932.inc
mysql-test/include/have_crypt.inc
mysql-test/include/have_debug.inc
mysql-test/include/have_eucjpms.inc
mysql-test/include/have_euckr.inc
mysql-test/include/have_example_plugin.inc
mysql-test/include/have_gb2312.inc
mysql-test/include/have_gbk.inc
mysql-test/include/have_geometry.inc
mysql-test/include/have_latin2_ch.inc
mysql-test/include/have_log_bin.inc
mysql-test/include/have_lowercase0.inc
mysql-test/include/have_ndbapi_examples.inc
mysql-test/include/have_outfile.inc
mysql-test/include/have_partition.inc
mysql-test/include/have_pool_of_threads.inc
mysql-test/include/have_query_cache.inc
mysql-test/include/have_sjis.inc
mysql-test/include/have_ssl_communication.inc
mysql-test/include/have_ssl_crypto_functs.inc
mysql-test/include/have_symlink.inc
mysql-test/include/have_tis620.inc
mysql-test/include/have_ucs2.inc
mysql-test/include/have_udf.inc
mysql-test/include/have_ujis.inc
mysql-test/include/have_utf16.inc
mysql-test/include/have_utf32.inc
mysql-test/r/group_min_max_innodb.result
mysql-test/r/max_user_connections_func.result
mysql-test/r/mysqltest.result
mysql-test/r/partition.result
mysql-test/r/partition_hash.result
mysql-test/r/partition_pruning.result
mysql-test/r/partition_range.result
mysql-test/r/ps_ddl.result
mysql-test/r/ps_ddl1.result
mysql-test/r/sp-error.result
mysql-test/r/subselect.result
mysql-test/r/subselect_no_mat.result
mysql-test/r/subselect_no_opts.result
mysql-test/r/subselect_no_semijoin.result
mysql-test/suite/binlog/r/binlog_base64_flag.result
mysql-test/suite/binlog/t/binlog_base64_flag.test
mysql-test/suite/funcs_1/r/falcon_storedproc.result
mysql-test/suite/funcs_1/r/innodb_storedproc.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/storedproc/storedproc_master.inc
mysql-test/suite/funcs_1/t/disabled.def
mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test
mysql-test/suite/funcs_2/charset/charset_master.test
mysql-test/suite/funcs_2/t/innodb_charset.test
mysql-test/suite/funcs_2/t/memory_charset.test
mysql-test/suite/funcs_2/t/myisam_charset.test
mysql-test/suite/funcs_2/t/ndb_charset.test
mysql-test/suite/parts/inc/part_supported_sql_funcs_delete.inc
mysql-test/suite/parts/inc/partition_alter_11.inc
mysql-test/suite/parts/inc/partition_bigint.inc
mysql-test/suite/parts/inc/partition_check_drop.inc
mysql-test/suite/parts/inc/partition_int.inc
mysql-test/suite/parts/inc/partition_layout.inc
mysql-test/suite/parts/inc/partition_layout_check1.inc
mysql-test/suite/parts/inc/partition_layout_check2.inc
mysql-test/suite/parts/inc/partition_mediumint.inc
mysql-test/suite/parts/inc/partition_smallint.inc
mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc
mysql-test/suite/parts/inc/partition_tinyint.inc
mysql-test/suite/parts/r/ndb_dd_backuprestore.result
mysql-test/suite/parts/r/part_supported_sql_func_ndb.result
mysql-test/suite/parts/r/partition_alter1_1_2_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_alter2_innodb.result
mysql-test/suite/parts/r/partition_alter2_myisam.result
mysql-test/suite/parts/r/partition_alter3_innodb.result
mysql-test/suite/parts/r/partition_alter3_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_myisam.result
mysql-test/suite/parts/r/partition_engine_ndb.result
mysql-test/suite/parts/r/partition_int_innodb.result
mysql-test/suite/parts/r/partition_int_myisam.result
mysql-test/suite/parts/r/partition_int_ndb.result
mysql-test/suite/parts/r/partition_syntax_myisam.result
mysql-test/suite/parts/t/disabled.def
mysql-test/suite/parts/t/ndb_dd_backuprestore.test
mysql-test/suite/parts/t/part_supported_sql_func_ndb.test
mysql-test/suite/parts/t/partition_alter1_1_2_ndb.test
mysql-test/suite/parts/t/partition_alter1_1_ndb.test
mysql-test/suite/parts/t/partition_alter1_2_ndb.test
mysql-test/suite/parts/t/partition_alter2_ndb.test
mysql-test/suite/parts/t/partition_basic_ndb.test
mysql-test/suite/parts/t/partition_bit_ndb.test
mysql-test/suite/parts/t/partition_engine_ndb.test
mysql-test/suite/parts/t/partition_int_ndb.test
mysql-test/suite/parts/t/partition_syntax_ndb.test
mysql-test/suite/parts/t/partition_value_ndb.test
mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test
mysql-test/t/group_min_max_innodb.test
mysql-test/t/max_user_connections_func.test
mysql-test/t/mysqltest.test
mysql-test/t/ps_ddl.test
mysql-test/t/ps_ddl1.test
mysql-test/t/sp-error.test
mysql-test/t/subselect.test
mysys/default.c
sql/field.cc
sql/field.h
sql/ha_partition.cc
sql/ha_partition.h
sql/item_subselect.cc
sql/log_event.cc
sql/rpl_utility.cc
sql/slave.cc
sql/slave.h
sql/sp_cache.cc
sql/sp_cache.h
sql/sql_insert.cc
sql/sql_prepare.cc
sql/sql_select.cc
sql/sql_yacc.yy
2743 Christopher Powers 2008-07-14 [merge]
(no message)
modified:
mysql-test/mysql-test-run.pl
2742 Christopher Powers 2008-07-14
Bug#38043: Deadlock between server and falcon
Restore warning in results file until online alter fixed
modified:
mysql-test/suite/falcon/r/falcon_bug_22161.result
2741 Christopher Powers 2008-07-14
Bug#38043: Deadlock between server and falcon
Temporarily disable online alter until StorageTableShare::getIndex() is fixed.
modified:
storage/falcon/StorageTableShare.cpp
storage/falcon/ha_falcon.cpp
2740 Hakan Kuecuekyilmaz 2008-07-13
Put back falcon_read-committed.test into falcon suite.
renamed:
mysql-test/suite/falcon_team/r/falcon_read-committed.result =>
mysql-test/suite/falcon/r/falcon_read-committed.result
mysql-test/suite/falcon_team/t/falcon_read-committed.test =>
mysql-test/suite/falcon/t/falcon_read-committed.test
modified:
mysql-test/suite/falcon/r/falcon_read-committed.result
mysql-test/suite/falcon/t/falcon_read-committed.test
2739 Ann Harrison 2008-07-12 [merge]
Added validation for AVL trees and fixed more missing
initializations.
modified:
storage/falcon/IndexWalker.cpp
storage/falcon/IndexWalker.h
2738 Ann Harrison 2008-07-12 [merge]
Continue to hunt down missing initializations
modified:
storage/falcon/IndexWalker.cpp
storage/falcon/IndexWalker.h
2737 Ann Harrison 2008-07-11 [merge]
Sync repository
modified:
mysql-test/suite/falcon/r/falcon_options.result
mysql-test/suite/falcon/r/falcon_options2.result
mysql-test/suite/falcon/t/falcon_options2.test
storage/falcon/Configuration.cpp
storage/falcon/Connection.cpp
storage/falcon/SectorBuffer.cpp
storage/falcon/StorageHandler.cpp
storage/falcon/StorageParameters.h
storage/falcon/Transaction.cpp
2736 Ann Harrison 2008-07-10 [merge]
sync repository
added:
storage/falcon/CompareAndSwapSparc.il
modified:
mysql-test/suite/falcon/r/falcon_bug_22150.result
mysql-test/suite/falcon/r/falcon_bug_37344_A.result
mysql-test/suite/falcon/r/falcon_options.result
mysql-test/suite/falcon/r/falcon_options2.result
mysql-test/suite/falcon/t/falcon_bug_22150.test
mysql-test/suite/falcon/t/falcon_bug_37344_A.test
storage/falcon/Cache.cpp
storage/falcon/IndexPage.cpp
storage/falcon/Interlock.h
storage/falcon/Makefile.am
storage/falcon/StorageParameters.h
storage/falcon/plug.in
2735 Ann Harrison 2008-07-09 [merge]
sync repository
modified:
storage/falcon/Gopher.cpp
storage/falcon/Gopher.h
storage/falcon/SerialLog.cpp
storage/falcon/SerialLog.h
storage/falcon/TableSpaceManager.cpp
2734 Ann Harrison 2008-07-09
Test and results for bug
added:
mysql-test/suite/falcon/r/falcon_bug_37343.result
mysql-test/suite/falcon/t/falcon_bug_37343.test
2733 Ann Harrison 2008-07-09 [merge]
Handle the case where the condition is beyond
the end of the index at the start
modified:
mysql-test/suite/falcon/r/falcon_bug_22161.result
mysql-test/suite/falcon/r/falcon_options.result
mysql-test/suite/falcon/r/falcon_options2.result
mysql-test/suite/falcon/t/falcon_options.test
mysql-test/suite/falcon/t/falcon_options2.test
mysql-test/suite/funcs_1/datadict/charset_collation.inc
mysql-test/suite/funcs_1/t/charset_collation_1.test
mysql-test/suite/funcs_1/t/charset_collation_3.test
mysql-test/suite/funcs_1/t/disabled.def
storage/falcon/Configuration.cpp
storage/falcon/IO.cpp
storage/falcon/IOx.h
storage/falcon/Page.h
storage/falcon/SectorBuffer.cpp
storage/falcon/SerialLogFile.cpp
storage/falcon/Statement.cpp
storage/falcon/StorageDatabase.cpp
storage/falcon/StorageDatabase.h
storage/falcon/StorageParameters.h
storage/falcon/StorageTableShare.cpp
storage/falcon/StorageTableShare.h
storage/falcon/WalkIndex.cpp
storage/falcon/ha_falcon.cpp
storage/falcon/ha_falcon.h
2732 Ann Harrison 2008-07-08
initialize balance in the IndexWalker class, so the AVL
rebalance works more generally. There is a nother faillure.
added:
mysql-test/suite/falcon/r/falcon_bug_37344_A.result
mysql-test/suite/falcon/t/falcon_bug_37344_A.test
modified:
storage/falcon/IndexWalker.cpp
2731 Hakan Kuecuekyilmaz 2008-07-03
Post-merge fix.
modified:
.bzr-mysql/default.conf
2730 Hakan Kuecuekyilmaz 2008-07-03 [merge]
Merge
modified:
.bzr-mysql/default.conf
client/mysqltest.c
2729 Hakan Kuecuekyilmaz 2008-07-03 [merge]
Merge
modified:
storage/falcon/SectorBuffer.cpp
2728 Hakan Kuecuekyilmaz 2008-07-03
Moved failing test case to falcon_team test suite. See Bug 37831 for reference.
renamed:
mysql-test/suite/falcon/r/falcon_bug_37080.result =>
mysql-test/suite/falcon_team/r/falcon_bug_37080.result
mysql-test/suite/falcon/t/falcon_bug_37080.test =>
mysql-test/suite/falcon_team/t/falcon_bug_37080.test
2727 Hakan Kuecuekyilmaz 2008-07-03
We want to see errors.
modified:
mysql-test/suite/falcon/t/falcon_bug_37080.test
2726 Hakan Kuecuekyilmaz 2008-07-02 [merge]
Merge something bzr forces me to do so.
2725 Hakan Kuecuekyilmaz 2008-07-02
Moved falcon_bug_23189.test to falcon_team.
falcon_bug_23189 fails randomly on Pushbuild.
renamed:
mysql-test/suite/falcon/r/falcon_bug_23189.result =>
mysql-test/suite/falcon_team/r/falcon_bug_23189.result
mysql-test/suite/falcon/t/falcon_bug_23189.test =>
mysql-test/suite/falcon_team/t/falcon_bug_23189.test
2724 Hakan Kuecuekyilmaz 2008-07-01
Bye bye Maria, we will miss you.
All the best,
Hakan
modified:
configure.in
2723 Hakan Kuecuekyilmaz 2008-06-30 [merge]
Merge from mysql-6.0.
removed:
dbug/.cvsignore
dbug/doinstall.sh
dbug/install.sh
dbug/mklintlib.sh
dbug/qmake.cmd
dbug/vargs.h
include/atomic/generic-msvc.h
include/lf.h
mysys/lf_alloc-pin.c
mysys/lf_dynarray.c
mysys/lf_hash.c
added:
BUILD/compile-amd64-gprof-no-ndb
dbug/remove_function_from_trace.pl
dbug/tests-t.pl
dbug/tests.c
include/atomic/generic-msvc.h
include/lf.h
include/maria.h
include/myisamchk.h
include/wqueue.h
mysql-test/include/have_maria.inc
mysql-test/include/maria_empty_logs.inc
mysql-test/include/maria_make_snapshot.inc
mysql-test/include/maria_make_snapshot_for_comparison.inc
mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc
mysql-test/include/maria_verify_recovery.inc
mysql-test/r/maria-big.result
mysql-test/r/maria-connect.result
mysql-test/r/maria-gis-rtree-dynamic.result
mysql-test/r/maria-gis-rtree-trans.result
mysql-test/r/maria-gis-rtree.result
mysql-test/r/maria-mvcc.result
mysql-test/r/maria-no-logging.result
mysql-test/r/maria-page-checksum.result
mysql-test/r/maria-preload.result
mysql-test/r/maria-purge.result
mysql-test/r/maria-recover.result
mysql-test/r/maria-recovery-big.result
mysql-test/r/maria-recovery-bitmap.result
mysql-test/r/maria-recovery-rtree-ft.result
mysql-test/r/maria-recovery.result
mysql-test/r/maria-recovery2.result
mysql-test/r/maria.result
mysql-test/r/maria2.result
mysql-test/r/maria3.result
mysql-test/r/maria_notembedded.result
mysql-test/r/old-mode.result
mysql-test/r/ps_maria.result
mysql-test/r/row-checksum-old.result
mysql-test/r/row-checksum.result
mysql-test/suite/rpl/r/rpl_stm_maria.result
mysql-test/suite/rpl/t/rpl_stm_maria.test
mysql-test/t/maria-big.test
mysql-test/t/maria-connect.test
mysql-test/t/maria-gis-rtree-dynamic.test
mysql-test/t/maria-gis-rtree-trans.test
mysql-test/t/maria-gis-rtree.test
mysql-test/t/maria-mvcc.test
mysql-test/t/maria-no-logging.test
mysql-test/t/maria-page-checksum.test
mysql-test/t/maria-preload.test
mysql-test/t/maria-purge.test
mysql-test/t/maria-recover-master.opt
mysql-test/t/maria-recover.test
mysql-test/t/maria-recovery-big-master.opt
mysql-test/t/maria-recovery-big.test
mysql-test/t/maria-recovery-bitmap-master.opt
mysql-test/t/maria-recovery-bitmap.test
mysql-test/t/maria-recovery-master.opt
mysql-test/t/maria-recovery-rtree-ft-master.opt
mysql-test/t/maria-recovery-rtree-ft.test
mysql-test/t/maria-recovery.test
mysql-test/t/maria-recovery2-master.opt
mysql-test/t/maria-recovery2.test
mysql-test/t/maria.test
mysql-test/t/maria2.test
mysql-test/t/maria3.test
mysql-test/t/maria_notembedded.test
mysql-test/t/old-mode-master.opt
mysql-test/t/old-mode.test
mysql-test/t/ps_maria.test
mysql-test/t/row-checksum-old-master.opt
mysql-test/t/row-checksum-old.test
mysql-test/t/row-checksum.test
mysql-test/t/sync_frm_basic-master.opt
mysys/lf_alloc-pin.c
mysys/lf_dynarray.c
mysys/lf_hash.c
mysys/my_chmod.c
mysys/my_rnd.c
mysys/my_safehash.c
mysys/my_safehash.h
mysys/my_uuid.c
mysys/wqueue.c
sql-bench/myisam.cnf
storage/maria/
storage/maria/CMakeLists.txt
storage/maria/KNOWN_BUGS.txt
storage/maria/Makefile.am
storage/maria/file_formats.txt
storage/maria/ft_maria.c
storage/maria/ha_maria.cc
storage/maria/ha_maria.h
storage/maria/lockman.c
storage/maria/lockman.h
storage/maria/ma_bitmap.c
storage/maria/ma_blockrec.c
storage/maria/ma_blockrec.h
storage/maria/ma_cache.c
storage/maria/ma_changed.c
storage/maria/ma_check.c
storage/maria/ma_check_standalone.h
storage/maria/ma_checkpoint.c
storage/maria/ma_checkpoint.h
storage/maria/ma_checksum.c
storage/maria/ma_close.c
storage/maria/ma_commit.c
storage/maria/ma_commit.h
storage/maria/ma_control_file.c
storage/maria/ma_control_file.h
storage/maria/ma_create.c
storage/maria/ma_dbug.c
storage/maria/ma_delete.c
storage/maria/ma_delete_all.c
storage/maria/ma_delete_table.c
storage/maria/ma_dynrec.c
storage/maria/ma_extra.c
storage/maria/ma_ft_boolean_search.c
storage/maria/ma_ft_eval.c
storage/maria/ma_ft_eval.h
storage/maria/ma_ft_nlq_search.c
storage/maria/ma_ft_parser.c
storage/maria/ma_ft_stem.c
storage/maria/ma_ft_test1.c
storage/maria/ma_ft_test1.h
storage/maria/ma_ft_update.c
storage/maria/ma_ftdefs.h
storage/maria/ma_fulltext.h
storage/maria/ma_info.c
storage/maria/ma_init.c
storage/maria/ma_key.c
storage/maria/ma_key_recover.c
storage/maria/ma_key_recover.h
storage/maria/ma_keycache.c
storage/maria/ma_locking.c
storage/maria/ma_loghandler.c
storage/maria/ma_loghandler.h
storage/maria/ma_loghandler_lsn.h
storage/maria/ma_open.c
storage/maria/ma_packrec.c
storage/maria/ma_page.c
storage/maria/ma_pagecache.c
storage/maria/ma_pagecache.h
storage/maria/ma_pagecaches.c
storage/maria/ma_pagecrc.c
storage/maria/ma_panic.c
storage/maria/ma_preload.c
storage/maria/ma_range.c
storage/maria/ma_recovery.c
storage/maria/ma_recovery.h
storage/maria/ma_recovery_util.c
storage/maria/ma_recovery_util.h
storage/maria/ma_rename.c
storage/maria/ma_rfirst.c
storage/maria/ma_rkey.c
storage/maria/ma_rlast.c
storage/maria/ma_rnext.c
storage/maria/ma_rnext_same.c
storage/maria/ma_rprev.c
storage/maria/ma_rrnd.c
storage/maria/ma_rsame.c
storage/maria/ma_rsamepos.c
storage/maria/ma_rt_index.c
storage/maria/ma_rt_index.h
storage/maria/ma_rt_key.c
storage/maria/ma_rt_key.h
storage/maria/ma_rt_mbr.c
storage/maria/ma_rt_mbr.h
storage/maria/ma_rt_split.c
storage/maria/ma_rt_test.c
storage/maria/ma_scan.c
storage/maria/ma_search.c
storage/maria/ma_sort.c
storage/maria/ma_sp_defs.h
storage/maria/ma_sp_key.c
storage/maria/ma_sp_test.c
storage/maria/ma_state.c
storage/maria/ma_state.h
storage/maria/ma_static.c
storage/maria/ma_statrec.c
storage/maria/ma_test1.c
storage/maria/ma_test2.c
storage/maria/ma_test3.c
storage/maria/ma_test_all.res
storage/maria/ma_test_all.sh
storage/maria/ma_test_big.sh
storage/maria/ma_test_force_start.pl
storage/maria/ma_test_recovery
storage/maria/ma_unique.c
storage/maria/ma_update.c
storage/maria/ma_write.c
storage/maria/maria_chk.c
storage/maria/maria_def.h
storage/maria/maria_ftdump.c
storage/maria/maria_pack.c
storage/maria/maria_read_log.c
storage/maria/maria_rename.sh
storage/maria/plug.in
storage/maria/tablockman.c
storage/maria/tablockman.h
storage/maria/test_pack
storage/maria/trnman.c
storage/maria/trnman.h
storage/maria/trnman_public.h
storage/maria/unittest/
storage/maria/unittest/CMakeLists.txt
storage/maria/unittest/Makefile.am
storage/maria/unittest/lockman-t.c
storage/maria/unittest/lockman1-t.c
storage/maria/unittest/lockman2-t.c
storage/maria/unittest/ma_control_file-t.c
storage/maria/unittest/ma_loghandler_examples.c
storage/maria/unittest/ma_maria_log_cleanup.c
storage/maria/unittest/ma_pagecache_consist.c
storage/maria/unittest/ma_pagecache_rwconsist.c
storage/maria/unittest/ma_pagecache_single.c
storage/maria/unittest/ma_test_all-t
storage/maria/unittest/ma_test_loghandler-t.c
storage/maria/unittest/ma_test_loghandler_first_lsn-t.c
storage/maria/unittest/ma_test_loghandler_max_lsn-t.c
storage/maria/unittest/ma_test_loghandler_multigroup-t.c
storage/maria/unittest/ma_test_loghandler_multithread-t.c
storage/maria/unittest/ma_test_loghandler_noflush-t.c
storage/maria/unittest/ma_test_loghandler_nologs-t.c
storage/maria/unittest/ma_test_loghandler_pagecache-t.c
storage/maria/unittest/ma_test_loghandler_purge-t.c
storage/maria/unittest/ma_test_recovery.expected
storage/maria/unittest/ma_test_recovery.pl
storage/maria/unittest/sequence_storage.c
storage/maria/unittest/sequence_storage.h
storage/maria/unittest/test_file.c
storage/maria/unittest/test_file.h
storage/maria/unittest/trnman-t.c
storage/myisam/ft_myisam.c
renamed:
mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result =>
mysql-test/suite/funcs_1/r/is_collation_charset_applic.result
mysql-test/suite/funcs_1/t/is_collation_character_set_applicability.test =>
mysql-test/suite/funcs_1/t/is_collation_charset_applic.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/SETUP.sh
BUILD/compile-dist
BitKeeper/triggers/post-commit
BitKeeper/triggers/pre-delta
CMakeLists.txt
Makefile.am
client/get_password.c
client/mysqladmin.cc
client/mysqltest.c
cmd-line-utils/readline/bind.c
cmd-line-utils/readline/chardefs.h
cmd-line-utils/readline/display.c
cmd-line-utils/readline/histexpand.c
cmd-line-utils/readline/history.c
cmd-line-utils/readline/readline.c
cmd-line-utils/readline/text.c
config/ac-macros/plugins.m4
configure.in
dbug/CMakeLists.txt*
dbug/Makefile.am
dbug/dbug.c
dbug/dbug_add_tags.pl
dbug/user.r
extra/Makefile.am
extra/replace.c
include/Makefile.am
include/atomic/gcc_builtins.h
include/atomic/rwlock.h
include/config-win.h
include/ft_global.h
include/keycache.h
include/m_string.h
include/my_alloc.h
include/my_atomic.h
include/my_base.h
include/my_dbug.h
include/my_global.h
include/my_handler.h
include/my_pthread.h
include/my_sys.h
include/my_tree.h
include/myisam.h
include/myisampack.h
include/mysql/plugin.h
include/mysql_com.h
include/mysys_err.h
include/thr_lock.h
libmysql/CMakeLists.txt
libmysql/Makefile.shared
libmysql/libmysql.c
libmysqld/CMakeLists.txt
mysql-test/extra/rpl_tests/rpl_flsh_tbls.test
mysql-test/extra/rpl_tests/rpl_insert_delayed.test
mysql-test/include/ps_conv.inc
mysql-test/include/varchar.inc
mysql-test/include/wait_until_connected_again.inc
mysql-test/install_test_db.sh
mysql-test/lib/mtr_process.pl
mysql-test/lib/mtr_report.pl
mysql-test/mysql-test-run.pl
mysql-test/r/alter_table.result
mysql-test/r/change_user.result
mysql-test/r/create.result
mysql-test/r/information_schema_parameters.result
mysql-test/r/information_schema_routines.result
mysql-test/r/innodb.result
mysql-test/r/merge.result
mysql-test/r/mix2_myisam.result
mysql-test/r/myisam.result
mysql-test/r/mysqldump.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/query_cache.result
mysql-test/r/subselect.result
mysql-test/r/subselect_no_mat.result
mysql-test/r/subselect_no_opts.result
mysql-test/r/subselect_no_semijoin.result
mysql-test/r/variables-big.result
mysql-test/suite/falcon/r/falcon_bug_22972.result
mysql-test/suite/funcs_1/datadict/is_routines.inc
mysql-test/suite/funcs_1/datadict/is_triggers.inc
mysql-test/suite/funcs_1/datadict/is_views.inc
mysql-test/suite/funcs_1/datadict/processlist_priv.inc
mysql-test/suite/funcs_1/datadict/processlist_val.inc
mysql-test/suite/funcs_1/datadict/tables2.inc
mysql-test/suite/funcs_1/r/is_columns.result
mysql-test/suite/funcs_1/r/is_events.result
mysql-test/suite/funcs_1/r/is_routines.result
mysql-test/suite/funcs_1/r/is_tables_is.result
mysql-test/suite/funcs_1/r/is_tables_myisam.result
mysql-test/suite/funcs_1/r/is_tables_mysql.result
mysql-test/suite/funcs_1/r/is_tables_ndb.result
mysql-test/suite/funcs_1/r/is_triggers.result
mysql-test/suite/funcs_1/r/is_views.result
mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
mysql-test/suite/funcs_1/t/is_columns.test
mysql-test/suite/funcs_1/t/is_events.test
mysql-test/suite/ndb/r/ndb_auto_increment.result
mysql-test/suite/ndb/r/ps_7ndb.result
mysql-test/suite/ndb/t/ndb_auto_increment.test
mysql-test/suite/rpl/r/rpl_insert.result
mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result
mysql-test/suite/rpl/r/rpl_row_insert_delayed.result
mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result
mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result
mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test
mysql-test/suite/rpl/t/rpl_insert.test
mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test
mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test
mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test
mysql-test/t/alter_table.test
mysql-test/t/change_user.test
mysql-test/t/crash_commit_before-master.opt
mysql-test/t/create.test
mysql-test/t/delayed.test
mysql-test/t/disabled.def
mysql-test/t/information_schema_parameters.test
mysql-test/t/information_schema_routines.test
mysql-test/t/merge.test
mysql-test/t/myisam.test
mysql-test/t/mysqldump.test
mysql-test/t/query_cache.test
mysql-test/t/query_cache_debug.test
mysql-test/t/query_cache_merge.test
mysql-test/t/subselect.test
mysql-test/t/variables-big.test
mysql-test/valgrind.supp
mysys/CMakeLists.txt
mysys/Makefile.am
mysys/array.c
mysys/checksum.c
mysys/errors.c
mysys/hash.c
mysys/mf_iocache.c
mysys/mf_iocache2.c
mysys/mf_keycache.c
mysys/mf_keycaches.c
mysys/my_bitmap.c
mysys/my_compress.c
mysys/my_error.c
mysys/my_fopen.c
mysys/my_getopt.c
mysys/my_handler.c
mysys/my_handler_errors.h
mysys/my_init.c
mysys/my_lock.c
mysys/my_pread.c
mysys/my_read.c
mysys/my_seek.c
mysys/my_static.c
mysys/my_static.h
mysys/my_sync.c
mysys/my_thr_init.c
mysys/my_winthread.c
mysys/my_write.c
mysys/safemalloc.c
mysys/thr_lock.c
mysys/thr_mutex.c
plugin/daemon_example/daemon_example.cc
scripts/Makefile.am
scripts/mysql_fix_privilege_tables.sh
sql-bench/example
sql/CMakeLists.txt
sql/event_data_objects.cc
sql/events.cc
sql/field.cc
sql/field.h
sql/filesort.cc
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.h
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_func.cc
sql/item_func.h
sql/item_strfunc.cc
sql/item_strfunc.h
sql/item_subselect.cc
sql/item_xmlfunc.cc
sql/lex.h
sql/lock.cc
sql/log.cc
sql/log_event.cc
sql/log_event_old.cc
sql/my_lock.c
sql/mysql_priv.h
sql/mysqld.cc
sql/opt_sum.cc
sql/partition_info.cc
sql/password.c
sql/protocol.cc
sql/rpl_filter.cc
sql/rpl_injector.cc
sql/rpl_injector.h
sql/rpl_rli.cc
sql/set_var.cc
sql/spatial.cc
sql/sql_acl.cc
sql/sql_base.cc
sql/sql_cache.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_crypt.cc
sql/sql_crypt.h
sql/sql_delete.cc
sql/sql_insert.cc
sql/sql_load.cc
sql/sql_parse.cc
sql/sql_plugin.cc
sql/sql_repl.cc
sql/sql_select.cc
sql/sql_select.h
sql/sql_show.cc
sql/sql_sort.h
sql/sql_table.cc
sql/sql_tablespace.cc
sql/sql_union.cc
sql/sql_update.cc
sql/sql_yacc.yy
sql/table.cc
sql/time.cc
sql/unireg.cc
storage/archive/ha_archive.cc
storage/archive/ha_archive.h
storage/csv/ha_tina.cc
storage/csv/ha_tina.h
storage/federated/ha_federated.cc
storage/federated/ha_federated.h
storage/heap/hp_write.c
storage/myisam/CMakeLists.txt
storage/myisam/Makefile.am
storage/myisam/ft_boolean_search.c
storage/myisam/ft_static.c
storage/myisam/ft_stopwords.c
storage/myisam/fulltext.h
storage/myisam/ha_myisam.cc
storage/myisam/ha_myisam.h
storage/myisam/mi_cache.c
storage/myisam/mi_check.c
storage/myisam/mi_checksum.c
storage/myisam/mi_close.c
storage/myisam/mi_create.c
storage/myisam/mi_dbug.c
storage/myisam/mi_delete.c
storage/myisam/mi_dynrec.c
storage/myisam/mi_extra.c
storage/myisam/mi_key.c
storage/myisam/mi_locking.c
storage/myisam/mi_log.c
storage/myisam/mi_open.c
storage/myisam/mi_packrec.c
storage/myisam/mi_range.c
storage/myisam/mi_rkey.c
storage/myisam/mi_search.c
storage/myisam/mi_test1.c
storage/myisam/mi_test2.c
storage/myisam/mi_test3.c
storage/myisam/mi_update.c
storage/myisam/mi_write.c
storage/myisam/myisamchk.c
storage/myisam/myisamdef.h
storage/myisam/myisamlog.c
storage/myisam/myisampack.c
storage/myisam/plug.in
storage/myisam/rt_index.c
storage/myisam/rt_test.c
storage/myisam/sort.c
storage/myisammrg/ha_myisammrg.cc
storage/myisammrg/ha_myisammrg.h
strings/CMakeLists.txt
strings/bmove512.c
strings/ctype.c
strings/strmake.c
support-files/compiler_warnings.supp
support-files/magic
support-files/mysql.spec.sh
tests/mysql_client_test.c
unittest/Makefile.am
unittest/mysys/Makefile.am
unittest/mysys/my_atomic-t.c
unittest/mytap/tap.c
unittest/mytap/tap.h
unittest/unit.pl
win/configure.js
mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test
2722 lars-erik.bjork@stripped 2008-06-30 [merge]
Merging
modified:
storage/falcon/Gopher.cpp
storage/falcon/SerialLog.cpp
storage/falcon/SyncTest.cpp
storage/falcon/SyncTest.h
2721 lars-erik.bjork@stripped 2008-06-30 [merge]
Merging
added:
.bzr-mysql.moved/
.bzr-mysql.moved/default.conf
mysql-test/include/wait_condition.inc
mysql-test/r/drop-no_root.result
mysql-test/r/information_schema-big.result
mysql-test/suite/funcs_1/datadict/is_key_column_usage.inc
mysql-test/suite/funcs_1/datadict/is_routines.inc
mysql-test/suite/funcs_1/datadict/is_schemata.inc
mysql-test/suite/funcs_1/datadict/is_tables.inc
mysql-test/suite/funcs_1/datadict/is_triggers.inc
mysql-test/suite/funcs_1/datadict/is_views.inc
mysql-test/suite/funcs_1/datadict/tables.inc
mysql-test/suite/funcs_1/include/bug28309_skip.inc
mysql-test/suite/funcs_1/include/tb3.inc
mysql-test/suite/funcs_1/r/is_cml_falcon.result
mysql-test/suite/funcs_1/r/is_cml_innodb.result
mysql-test/suite/funcs_1/r/is_cml_memory.result
mysql-test/suite/funcs_1/r/is_cml_myisam.result
mysql-test/suite/funcs_1/r/is_cml_ndb.result
mysql-test/suite/funcs_1/r/is_columns_falcon.result
mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result
mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
mysql-test/suite/funcs_1/r/is_key_column_usage_embedded.result
mysql-test/suite/funcs_1/r/is_routines_embedded.result
mysql-test/suite/funcs_1/r/is_schemata_embedded.result
mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result
mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result
mysql-test/suite/funcs_1/r/is_tables_embedded.result
mysql-test/suite/funcs_1/r/is_tables_myisam_embedded.result
mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result
mysql-test/suite/funcs_1/r/is_triggers_embedded.result
mysql-test/suite/funcs_1/r/is_views_embedded.result
mysql-test/suite/funcs_1/r/ndb_trig_0102.result
mysql-test/suite/funcs_1/r/ndb_trig_03.result
mysql-test/suite/funcs_1/r/ndb_trig_0407.result
mysql-test/suite/funcs_1/r/ndb_trig_08.result
mysql-test/suite/funcs_1/r/ndb_trig_09.result
mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result
mysql-test/suite/funcs_1/t/is_cml_falcon.test
mysql-test/suite/funcs_1/t/is_cml_innodb.test
mysql-test/suite/funcs_1/t/is_cml_memory.test
mysql-test/suite/funcs_1/t/is_cml_myisam.test
mysql-test/suite/funcs_1/t/is_cml_ndb.test
mysql-test/suite/funcs_1/t/is_columns_falcon.test
mysql-test/suite/funcs_1/t/is_columns_is_embedded.test
mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test
mysql-test/suite/funcs_1/t/is_columns_mysql_embedded.test
mysql-test/suite/funcs_1/t/is_key_column_usage_embedded.test
mysql-test/suite/funcs_1/t/is_routines_embedded.test
mysql-test/suite/funcs_1/t/is_schemata_embedded.test
mysql-test/suite/funcs_1/t/is_statistics_mysql_embedded.test
mysql-test/suite/funcs_1/t/is_table_constraints_mysql_embedded.test
mysql-test/suite/funcs_1/t/is_tables_embedded.test
mysql-test/suite/funcs_1/t/is_tables_myisam_embedded.test
mysql-test/suite/funcs_1/t/is_tables_mysql_embedded.test
mysql-test/suite/funcs_1/t/is_triggers_embedded.test
mysql-test/suite/funcs_1/t/is_views_embedded.test
mysql-test/suite/funcs_1/t/ndb_trig_0102.test
mysql-test/suite/funcs_1/t/ndb_trig_03.test
mysql-test/suite/funcs_1/t/ndb_trig_0407.test
mysql-test/suite/funcs_1/t/ndb_trig_08.test
mysql-test/suite/funcs_1/t/ndb_trig_09.test
mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test
mysql-test/suite/rpl/r/rpl_view_multi.result
mysql-test/suite/rpl/t/rpl_view_multi.test
mysql-test/suite/rpl_ndb_big/
mysql-test/suite/rpl_ndb_big/r/
mysql-test/suite/rpl_ndb_big/t/
mysql-test/suite/rpl_ndb_big/t/disabled.def
mysql-test/t/drop-no_root.test
mysql-test/t/information_schema-big.test
sql/mdl.cc
sql/mdl.h
sql/sql_plist.h
renamed:
mysql-test/include/wait_condition.inc => mysql-test/include/wait_condition.inc.moved
mysql-test/suite/funcs_1/r/ndb_trig_0102.result =>
mysql-test/suite/funcs_1/r/ndb_trig_0102.result.moved
mysql-test/suite/funcs_1/r/ndb_trig_03.result =>
mysql-test/suite/funcs_1/r/ndb_trig_03.result.moved
mysql-test/suite/funcs_1/r/ndb_trig_0407.result =>
mysql-test/suite/funcs_1/r/ndb_trig_0407.result.moved
mysql-test/suite/funcs_1/r/ndb_trig_08.result =>
mysql-test/suite/funcs_1/r/ndb_trig_08.result.moved
mysql-test/suite/funcs_1/r/ndb_trig_09.result =>
mysql-test/suite/funcs_1/r/ndb_trig_09.result.moved
mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result =>
mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result.moved
mysql-test/suite/funcs_1/t/ndb_trig_0102.test =>
mysql-test/suite/funcs_1/t/ndb_trig_0102.test.moved
mysql-test/suite/funcs_1/t/ndb_trig_03.test =>
mysql-test/suite/funcs_1/t/ndb_trig_03.test.moved
mysql-test/suite/funcs_1/t/ndb_trig_0407.test =>
mysql-test/suite/funcs_1/t/ndb_trig_0407.test.moved
mysql-test/suite/funcs_1/t/ndb_trig_08.test =>
mysql-test/suite/funcs_1/t/ndb_trig_08.test.moved
mysql-test/suite/funcs_1/t/ndb_trig_09.test =>
mysql-test/suite/funcs_1/t/ndb_trig_09.test.moved
mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test =>
mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test.moved
mysql-test/suite/rpl_ndb/r/rpl_ndb_2innodb.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_2innodb.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_2myisam.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_2myisam.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_2ndb.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_2ndb.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_2other.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_2other.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_UUID.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_UUID.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_add_column.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_add_column.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_apply_status.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_apply_status.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_auto_inc.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_auto_inc.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_bank.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_bank.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_blob.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_blob.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_blob2.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_blob2.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_circular_simplex.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_commit_afterflush.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_commit_afterflush.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_ctype_ucs2_def.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_partitions.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_dd_partitions.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_ddl.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_ddl.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_delete_nowhere.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_delete_nowhere.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_do_db.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_do_db.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_do_table.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_do_table.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_func003.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_func003.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb_trans.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_innodb_trans.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_insert_ignore.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_insert_ignore.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_load.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_load.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_log.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_multi.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update2.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_multi_update2.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_multi_update3.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_myisam2ndb.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_myisam2ndb.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_relayrotate.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_relayrotate.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_ignore.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_rep_ignore.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_row_001.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_sp003.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_sp003.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_sp006.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_stm_innodb.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_sync.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_transaction.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_trig004.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_trig004.result
mysql-test/suite/rpl_ndb/r/rpl_ndbapi_multi.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndbapi_multi.result
mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_row_basic_7ndb.result
mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_truncate_7ndb.result
mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-master.opt =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_2innodb-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-slave.opt =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_2innodb-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_2innodb.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-master.opt =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_2myisam-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-slave.opt =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_2myisam-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_2myisam.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb-slave.opt =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_2ndb-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_2ndb.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_2other-slave.opt =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_2other-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_2other.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_UUID.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_UUID.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_add_column.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_add_column.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status-master.opt =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_apply_status-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_apply_status.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_auto_inc.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_auto_inc.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_bank.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_blob.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_blob2.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_blob2.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_circular_simplex.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_commit_afterflush.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def-master.opt =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_ctype_ucs2_def-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_ctype_ucs2_def.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-master.opt =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_dd_partitions-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-slave.opt =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_dd_partitions-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_dd_partitions.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_ddl.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_ddl.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_delete_nowhere.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_delete_nowhere.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db-slave.opt =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_do_db-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_do_db.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table-slave.opt =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_do_table-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_do_table.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_func003.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_func003.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans-slave.opt =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_innodb_trans-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_innodb_trans.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_insert_ignore.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_insert_ignore.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_load.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_load.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_log-master.opt =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_log-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_log.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_log.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_multi.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2-slave.opt =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_multi_update2-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_multi_update2.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update3.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_multi_update3.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-slave.opt =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_myisam2ndb-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_myisam2ndb.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate-slave.opt =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_relayrotate-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_relayrotate.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore-slave.opt =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_rep_ignore-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_rep_ignore.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_row_001.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_row_001.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_sp003.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_sp003.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_sp006.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_sp006.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-master.opt =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_stm_innodb-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_stm_innodb.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_sync.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction-master.opt =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_transaction-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction-slave.opt =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_transaction-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_transaction.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_trig004.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_trig004.test
mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndbapi_multi.test
mysql-test/suite/rpl_ndb/t/rpl_row_basic_7ndb.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_row_basic_7ndb.test
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_truncate_7ndb.test
sql/stacktrace.c => mysys/stacktrace.c
sql/stacktrace.h => include/my_stacktrace.h
modified:
.bzr-mysql/default.conf
Makefile.am
client/CMakeLists.txt
client/Makefile.am
client/mysql.cc
client/mysqltest.c
configure.in
include/Makefile.am
include/my_base.h
include/my_global.h
include/thr_lock.h
libmysqld/CMakeLists.txt
libmysqld/Makefile.am
libmysqld/lib_sql.cc
mysql-test/extra/rpl_tests/rpl_row_basic.test
mysql-test/include/handler.inc
mysql-test/include/locktrans.inc
mysql-test/include/mix1.inc
mysql-test/include/query_cache_sql_prepare.inc
mysql-test/mysql-test-run.pl
mysql-test/r/alter_table.result
mysql-test/r/create.result
mysql-test/r/flush.result
mysql-test/r/flush_table.result
mysql-test/r/func_gconcat.result
mysql-test/r/func_misc.result
mysql-test/r/group_concat_max_len_func.result
mysql-test/r/handler_innodb.result
mysql-test/r/handler_myisam.result
mysql-test/r/information_schema.result
mysql-test/r/innodb-replace.result
mysql-test/r/innodb_mysql.result
mysql-test/r/join_outer.result
mysql-test/r/kill.result
mysql-test/r/lock.result
mysql-test/r/locktrans_innodb.result
mysql-test/r/locktrans_myisam.result
mysql-test/r/merge.result
mysql-test/r/mysqldump.result
mysql-test/r/partition.result
mysql-test/r/ps_ddl.result
mysql-test/r/query_cache.result
mysql-test/r/query_cache_merge.result
mysql-test/r/query_cache_ps_no_prot.result
mysql-test/r/query_cache_ps_ps_prot.result
mysql-test/r/sp.result
mysql-test/r/view.result
mysql-test/r/view_grant.result
mysql-test/suite/funcs_1/datadict/columns.inc
mysql-test/suite/funcs_1/datadict/datadict_load.inc
mysql-test/suite/funcs_1/datadict/tables1.inc
mysql-test/suite/funcs_1/datadict/tables2.inc
mysql-test/suite/funcs_1/include/falcon_tb1.inc
mysql-test/suite/funcs_1/include/falcon_tb3.inc
mysql-test/suite/funcs_1/include/falcon_tb4.inc
mysql-test/suite/funcs_1/include/innodb_tb1.inc
mysql-test/suite/funcs_1/include/innodb_tb3.inc
mysql-test/suite/funcs_1/include/innodb_tb4.inc
mysql-test/suite/funcs_1/include/memory_tb4.inc
mysql-test/suite/funcs_1/include/myisam_tb1.inc
mysql-test/suite/funcs_1/include/myisam_tb3.inc
mysql-test/suite/funcs_1/include/myisam_tb4.inc
mysql-test/suite/funcs_1/r/falcon_func_view.result
mysql-test/suite/funcs_1/r/falcon_trig_0102.result
mysql-test/suite/funcs_1/r/falcon_trig_03.result
mysql-test/suite/funcs_1/r/falcon_trig_0407.result
mysql-test/suite/funcs_1/r/falcon_trig_08.result
mysql-test/suite/funcs_1/r/falcon_trig_09.result
mysql-test/suite/funcs_1/r/falcon_trig_1011ext.result
mysql-test/suite/funcs_1/r/falcon_trig_frkey.result
mysql-test/suite/funcs_1/r/innodb_func_view.result
mysql-test/suite/funcs_1/r/innodb_trig_0102.result
mysql-test/suite/funcs_1/r/innodb_trig_03.result
mysql-test/suite/funcs_1/r/innodb_trig_0407.result
mysql-test/suite/funcs_1/r/innodb_trig_08.result
mysql-test/suite/funcs_1/r/innodb_trig_09.result
mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
mysql-test/suite/funcs_1/r/is_columns_innodb.result
mysql-test/suite/funcs_1/r/is_columns_memory.result
mysql-test/suite/funcs_1/r/is_columns_myisam.result
mysql-test/suite/funcs_1/r/is_tables_innodb.result
mysql-test/suite/funcs_1/r/is_tables_is.result
mysql-test/suite/funcs_1/r/is_tables_is_falcon.result
mysql-test/suite/funcs_1/r/is_tables_memory.result
mysql-test/suite/funcs_1/r/is_tables_myisam.result
mysql-test/suite/funcs_1/r/is_tables_mysql.result
mysql-test/suite/funcs_1/r/is_tables_ndb.result
mysql-test/suite/funcs_1/r/memory_bitdata.result
mysql-test/suite/funcs_1/r/memory_cursors.result
mysql-test/suite/funcs_1/r/memory_func_view.result
mysql-test/suite/funcs_1/r/memory_storedproc.result
mysql-test/suite/funcs_1/r/memory_storedproc_02.result
mysql-test/suite/funcs_1/r/memory_storedproc_03.result
mysql-test/suite/funcs_1/r/memory_storedproc_06.result
mysql-test/suite/funcs_1/r/memory_storedproc_07.result
mysql-test/suite/funcs_1/r/memory_storedproc_08.result
mysql-test/suite/funcs_1/r/memory_storedproc_10.result
mysql-test/suite/funcs_1/r/memory_trig_0102.result
mysql-test/suite/funcs_1/r/memory_trig_03.result
mysql-test/suite/funcs_1/r/memory_trig_03e.result
mysql-test/suite/funcs_1/r/memory_trig_0407.result
mysql-test/suite/funcs_1/r/memory_trig_08.result
mysql-test/suite/funcs_1/r/memory_trig_09.result
mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
mysql-test/suite/funcs_1/r/memory_views.result
mysql-test/suite/funcs_1/r/myisam_bitdata.result
mysql-test/suite/funcs_1/r/myisam_cursors.result
mysql-test/suite/funcs_1/r/myisam_func_view.result
mysql-test/suite/funcs_1/r/myisam_storedproc.result
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
mysql-test/suite/funcs_1/r/myisam_trig_0102.result
mysql-test/suite/funcs_1/r/myisam_trig_03.result
mysql-test/suite/funcs_1/r/myisam_trig_03e.result
mysql-test/suite/funcs_1/r/myisam_trig_0407.result
mysql-test/suite/funcs_1/r/myisam_trig_08.result
mysql-test/suite/funcs_1/r/myisam_trig_09.result
mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
mysql-test/suite/funcs_1/r/myisam_views.result
mysql-test/suite/funcs_1/r/ndb_func_view.result
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
mysql-test/suite/funcs_1/t/disabled.def
mysql-test/suite/funcs_1/t/falcon_trig_0102.test
mysql-test/suite/funcs_1/t/falcon_trig_03.test
mysql-test/suite/funcs_1/t/falcon_trig_03e.test
mysql-test/suite/funcs_1/t/falcon_trig_0407.test
mysql-test/suite/funcs_1/t/falcon_trig_08.test
mysql-test/suite/funcs_1/t/falcon_trig_09.test
mysql-test/suite/funcs_1/t/falcon_trig_1011ext.test
mysql-test/suite/funcs_1/t/falcon_trig_frkey.test
mysql-test/suite/funcs_1/t/innodb_storedproc.test
mysql-test/suite/funcs_1/t/innodb_trig_0102.test
mysql-test/suite/funcs_1/t/innodb_trig_03.test
mysql-test/suite/funcs_1/t/innodb_trig_03e.test
mysql-test/suite/funcs_1/t/innodb_trig_0407.test
mysql-test/suite/funcs_1/t/innodb_trig_08.test
mysql-test/suite/funcs_1/t/innodb_trig_09.test
mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test
mysql-test/suite/funcs_1/t/innodb_trig_frkey.test
mysql-test/suite/funcs_1/t/is_basics_mixed.test
mysql-test/suite/funcs_1/t/is_character_sets.test
mysql-test/suite/funcs_1/t/is_collation_character_set_applicability.test
mysql-test/suite/funcs_1/t/is_collations.test
mysql-test/suite/funcs_1/t/is_column_privileges.test
mysql-test/suite/funcs_1/t/is_column_privileges_is_mysql_test.test
mysql-test/suite/funcs_1/t/is_columns.test
mysql-test/suite/funcs_1/t/is_columns_innodb.test
mysql-test/suite/funcs_1/t/is_columns_is.test
mysql-test/suite/funcs_1/t/is_columns_is_falcon.test
mysql-test/suite/funcs_1/t/is_columns_memory.test
mysql-test/suite/funcs_1/t/is_columns_myisam.test
mysql-test/suite/funcs_1/t/is_columns_mysql.test
mysql-test/suite/funcs_1/t/is_columns_ndb.test
mysql-test/suite/funcs_1/t/is_engines.test
mysql-test/suite/funcs_1/t/is_events.test
mysql-test/suite/funcs_1/t/is_key_column_usage.test
mysql-test/suite/funcs_1/t/is_routines.test
mysql-test/suite/funcs_1/t/is_schema_privileges.test
mysql-test/suite/funcs_1/t/is_schema_privileges_is_mysql_test.test
mysql-test/suite/funcs_1/t/is_schemata.test
mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test
mysql-test/suite/funcs_1/t/is_statistics.test
mysql-test/suite/funcs_1/t/is_statistics_mysql.test
mysql-test/suite/funcs_1/t/is_table_constraints.test
mysql-test/suite/funcs_1/t/is_table_constraints_mysql.test
mysql-test/suite/funcs_1/t/is_table_privileges.test
mysql-test/suite/funcs_1/t/is_tables.test
mysql-test/suite/funcs_1/t/is_tables_innodb.test
mysql-test/suite/funcs_1/t/is_tables_memory.test
mysql-test/suite/funcs_1/t/is_tables_myisam.test
mysql-test/suite/funcs_1/t/is_tables_mysql.test
mysql-test/suite/funcs_1/t/is_tables_ndb.test
mysql-test/suite/funcs_1/t/is_triggers.test
mysql-test/suite/funcs_1/t/is_user_privileges.test
mysql-test/suite/funcs_1/t/is_views.test
mysql-test/suite/funcs_1/t/memory_bitdata.test
mysql-test/suite/funcs_1/t/memory_cursors.test
mysql-test/suite/funcs_1/t/memory_func_view.test
mysql-test/suite/funcs_1/t/memory_storedproc.test
mysql-test/suite/funcs_1/t/memory_storedproc_02.test
mysql-test/suite/funcs_1/t/memory_storedproc_03.test
mysql-test/suite/funcs_1/t/memory_storedproc_06.test
mysql-test/suite/funcs_1/t/memory_storedproc_07.test
mysql-test/suite/funcs_1/t/memory_storedproc_08.test
mysql-test/suite/funcs_1/t/memory_storedproc_10.test
mysql-test/suite/funcs_1/t/memory_trig_0102.test
mysql-test/suite/funcs_1/t/memory_trig_03.test
mysql-test/suite/funcs_1/t/memory_trig_03e.test
mysql-test/suite/funcs_1/t/memory_trig_0407.test
mysql-test/suite/funcs_1/t/memory_trig_08.test
mysql-test/suite/funcs_1/t/memory_trig_09.test
mysql-test/suite/funcs_1/t/memory_trig_1011ext.test
mysql-test/suite/funcs_1/t/memory_views.test
mysql-test/suite/funcs_1/t/myisam_bitdata.test
mysql-test/suite/funcs_1/t/myisam_cursors.test
mysql-test/suite/funcs_1/t/myisam_func_view.test
mysql-test/suite/funcs_1/t/myisam_storedproc.test
mysql-test/suite/funcs_1/t/myisam_storedproc_02.test
mysql-test/suite/funcs_1/t/myisam_storedproc_03.test
mysql-test/suite/funcs_1/t/myisam_storedproc_06.test
mysql-test/suite/funcs_1/t/myisam_storedproc_07.test
mysql-test/suite/funcs_1/t/myisam_storedproc_08.test
mysql-test/suite/funcs_1/t/myisam_storedproc_10.test
mysql-test/suite/funcs_1/t/myisam_trig_0102.test
mysql-test/suite/funcs_1/t/myisam_trig_03.test
mysql-test/suite/funcs_1/t/myisam_trig_03e.test
mysql-test/suite/funcs_1/t/myisam_trig_0407.test
mysql-test/suite/funcs_1/t/myisam_trig_08.test
mysql-test/suite/funcs_1/t/myisam_trig_09.test
mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test
mysql-test/suite/funcs_1/t/myisam_views.test
mysql-test/suite/funcs_1/t/ndb_storedproc.test
mysql-test/suite/funcs_1/t/ndb_trig_03e.test
mysql-test/suite/funcs_1/t/processlist_priv_no_prot.test
mysql-test/suite/funcs_1/t/processlist_priv_ps.test
mysql-test/suite/funcs_1/t/processlist_val_no_prot.test
mysql-test/suite/funcs_1/t/processlist_val_ps.test
mysql-test/suite/funcs_1/triggers/trig_frkey.inc
mysql-test/suite/funcs_1/triggers/triggers_0102.inc
mysql-test/suite/funcs_1/triggers/triggers_03.inc
mysql-test/suite/funcs_1/triggers/triggers_0407.inc
mysql-test/suite/funcs_1/triggers/triggers_08.inc
mysql-test/suite/funcs_1/triggers/triggers_09.inc
mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
mysql-test/suite/funcs_1/views/func_view.inc
mysql-test/suite/funcs_1/views/views_master.inc
mysql-test/suite/rpl/r/rpl_heartbeat.result
mysql-test/suite/rpl/r/rpl_locktrans_innodb.result
mysql-test/suite/rpl/r/rpl_locktrans_myisam.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_trigger.result
mysql-test/suite/rpl_ndb/t/disabled.def
mysql-test/t/alter_table.test
mysql-test/t/create.test
mysql-test/t/disabled.def
mysql-test/t/flush.test
mysql-test/t/flush_table.test
mysql-test/t/func_gconcat.test
mysql-test/t/func_misc.test
mysql-test/t/information_schema.test
mysql-test/t/innodb-replace.test
mysql-test/t/kill.test
mysql-test/t/lock.test
mysql-test/t/lock_multi.test
mysql-test/t/merge-big.test
mysql-test/t/merge.test
mysql-test/t/mysql_delimiter.sql
mysql-test/t/mysqldump.test
mysql-test/t/partition.test
mysql-test/t/partition_hash.test
mysql-test/t/ps_ddl.test
mysql-test/t/query_cache_merge.test
mysql-test/t/sp.test
mysql-test/t/sql_low_priority_updates_func.test
mysql-test/t/subselect.test
mysql-test/t/trigger_notembedded.test
mysql-test/t/view.test
mysql-test/t/view_grant.test
mysys/CMakeLists.txt
mysys/Makefile.am
mysys/thr_lock.c
sql/CMakeLists.txt
sql/Makefile.am
sql/backup/backup_progress.cc
sql/backup/be_default.cc
sql/backup/be_default.h
sql/backup/be_thread.cc
sql/backup/be_thread.h
sql/backup/kernel.cc
sql/event_db_repository.cc
sql/field.h
sql/ha_ndbcluster.cc
sql/ha_ndbcluster_binlog.cc
sql/ha_partition.cc
sql/ha_partition.h
sql/handler.cc
sql/item_sum.cc
sql/item_sum.h
sql/lock.cc
sql/log.cc
sql/log_event.cc
sql/log_event_old.cc
sql/mysql_priv.h
sql/mysqld.cc
sql/rpl_rli.cc
sql/rpl_rli.h
sql/scheduler.cc
sql/set_var.cc
sql/share/errmsg.txt
sql/si_objects.cc
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_connect.cc
sql/sql_cursor.cc
sql/sql_db.cc
sql/sql_delete.cc
sql/sql_error.h
sql/sql_handler.cc
sql/sql_insert.cc
sql/sql_load.cc
sql/sql_parse.cc
sql/sql_partition.cc
sql/sql_plugin.cc
sql/sql_prepare.cc
sql/sql_profile.cc
sql/sql_profile.h
sql/sql_rename.cc
sql/sql_select.cc
sql/sql_servers.cc
sql/sql_show.cc
sql/sql_table.cc
sql/sql_test.cc
sql/sql_trigger.cc
sql/sql_udf.cc
sql/sql_update.cc
sql/sql_view.cc
sql/table.cc
sql/table.h
storage/csv/ha_tina.cc
storage/csv/ha_tina.h
storage/falcon/Interlock.h
storage/myisam/ha_myisam.cc
storage/myisammrg/ha_myisammrg.cc
storage/myisammrg/ha_myisammrg.h
storage/myisammrg/myrg_extra.c
tests/mysql_client_test.c
mysql-test/suite/rpl_ndb_big/r/rpl_row_basic_7ndb.result
mysys/stacktrace.c
include/my_stacktrace.h
2720 lars-erik.bjork@stripped 2008-06-26
bug#36825 - falcon_index_chill_threshold and falcon_record_chill_threshold have
values in MB
falcon_index_chill_threshold and falcon_record_chill_threshold accept a value in
megabytes.
This is non-standard with respect to the rest of the server options, prevents from
setting
the variables to lower than 1mb, which prevents testing of the chill/thaw mechanism
and
prevents the user from using the KB, MB and GB modifiers provided by server.
falcon_index_chill_threshold and falcon_record_chill_threshold are now changed to
accept a value
in bytes.
The tests falcon_options and falcon_options2 are also changed to work accordingly.
modified:
mysql-test/suite/falcon/r/falcon_options.result
mysql-test/suite/falcon/r/falcon_options2.result
mysql-test/suite/falcon/t/falcon_options.test
storage/falcon/Configuration.cpp
storage/falcon/StorageParameters.h
storage/falcon/ha_falcon.cpp
2719 Hakan Kuecuekyilmaz 2008-06-25 [merge]
Merge.
modified:
mysql-test/suite/falcon/r/falcon_options.result
mysql-test/suite/falcon/r/falcon_options2.result
storage/falcon/SerialLog.cpp
storage/falcon/SerialLogFile.cpp
storage/falcon/SerialLogFile.h
storage/falcon/ha_falcon.cpp
2718 Hakan Kuecuekyilmaz 2008-06-25 [merge]
Merge from main.
added:
mysql-test/r/innodb-autoinc.result
mysql-test/r/innodb_bug34053.result
mysql-test/r/innodb_bug34300.result
mysql-test/r/innodb_bug35220.result
mysql-test/suite/bugs/r/rpl_bug33029.result
mysql-test/suite/bugs/t/rpl_bug33029.test
mysql-test/t/innodb-autoinc.test
mysql-test/t/innodb_bug34053.test
mysql-test/t/innodb_bug34300.test
mysql-test/t/innodb_bug35220.test
modified:
client/mysql.cc
mysql-test/lib/mtr_cases.pl
mysql-test/r/innodb.result
mysql-test/r/mysql.result
mysql-test/r/partition_innodb.result
mysql-test/r/repair.result
mysql-test/r/subselect.result
mysql-test/r/subselect_no_mat.result
mysql-test/r/subselect_no_opts.result
mysql-test/r/subselect_no_semijoin.result
mysql-test/suite/binlog/r/binlog_innodb.result
mysql-test/suite/rpl/t/disabled.def
mysql-test/t/innodb.test
mysql-test/t/mysql_delimiter.sql
mysql-test/t/partition_innodb.test
mysql-test/t/subselect.test
scripts/make_binary_distribution.sh
sql/slave.cc
sql/sql_class.cc
sql/sql_plugin.cc
sql/sql_select.cc
sql/sql_table.cc
sql/structs.h
storage/innobase/Makefile.am
storage/innobase/btr/btr0cur.c
storage/innobase/buf/buf0buf.c
storage/innobase/dict/dict0dict.c
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innobase/include/buf0buf.h
storage/innobase/include/dict0dict.h
storage/innobase/include/dict0mem.h
storage/innobase/include/mach0data.h
storage/innobase/include/mach0data.ic
storage/innobase/include/os0sync.h
storage/innobase/include/read0read.h
storage/innobase/include/row0mysql.h
storage/innobase/include/row0sel.h
storage/innobase/include/srv0srv.h
storage/innobase/include/sync0arr.h
storage/innobase/include/sync0rw.h
storage/innobase/include/sync0rw.ic
storage/innobase/include/sync0sync.h
storage/innobase/include/sync0sync.ic
storage/innobase/include/trx0undo.h
storage/innobase/include/univ.i
storage/innobase/include/ut0ut.h
storage/innobase/os/os0file.c
storage/innobase/os/os0sync.c
storage/innobase/plug.in
storage/innobase/read/read0read.c
storage/innobase/row/row0mysql.c
storage/innobase/row/row0sel.c
storage/innobase/srv/srv0srv.c
storage/innobase/srv/srv0start.c
storage/innobase/sync/sync0arr.c
storage/innobase/sync/sync0rw.c
storage/innobase/sync/sync0sync.c
storage/innobase/trx/trx0trx.c
storage/innobase/trx/trx0undo.c
storage/innobase/ut/ut0ut.c
2717 Hakan Kuecuekyilmaz 2008-06-25
Added missing include/have_falcon.inc.
modified:
mysql-test/suite/falcon/t/rpl_falcon_bug_37221.test
2716 John H. Embretsen 2008-06-23
Fixed typo in falcon_bug_30031.test.
The typo used to cause a warning during test runs.
modified:
mysql-test/suite/falcon/t/falcon_bug_30031.test
2715 John H. Embretsen 2008-06-23
Fixed Falcon's template for regression tests:
* Added requirement --source include/have_falcon.inc
* Fixed a typo
modified:
mysql-test/suite/falcon/t/falcon_bug.template
2714 Vladislav Vaintroub 2008-06-23
Comment FAST_SHARED. SyncObject deadlocks with it.
modified:
storage/falcon/SyncObject.cpp
2713 Olav Sandstaa 2008-06-20 [merge]
Commiting into my local repository after merging.
added:
mysql-test/suite/falcon/r/falcon_bug_33397.result
mysql-test/suite/falcon/r/falcon_bug_33723.result
mysql-test/suite/falcon/r/falcon_bug_34048.result
mysql-test/suite/falcon/t/falcon_bug_33397.test
mysql-test/suite/falcon/t/falcon_bug_33723.test
mysql-test/suite/falcon/t/falcon_bug_34048.test
modified:
mysql-test/suite/falcon/r/falcon_bug_34617.result
mysql-test/suite/falcon/t/falcon_bug_34617.test
storage/falcon/AsciiBlob.cpp
storage/falcon/BinaryBlob.cpp
storage/falcon/Bitmap.cpp
storage/falcon/BlobReference.cpp
storage/falcon/BlobReference.h
storage/falcon/CMakeLists.txt
storage/falcon/DateTime.cpp
storage/falcon/Decompress.cpp
storage/falcon/Engine.h
storage/falcon/Error.cpp
storage/falcon/Event.cpp
storage/falcon/License.cpp
storage/falcon/Makefile.am
storage/falcon/MemMgr.cpp
storage/falcon/PriorityScheduler.cpp
storage/falcon/Protocol.cpp
storage/falcon/SQLError.cpp
storage/falcon/Socket.cpp
storage/falcon/Socket.h
storage/falcon/Stream.cpp
storage/falcon/Stream.h
storage/falcon/StreamSegment.cpp
storage/falcon/SyncObject.cpp
storage/falcon/SyncObject.h
storage/falcon/SyncTest.cpp
storage/falcon/SyncTest.h
storage/falcon/Synchronize.cpp
storage/falcon/Synchronize.h
storage/falcon/Thread.cpp
storage/falcon/Thread.h
storage/falcon/Types.h
2712 Olav Sandstaa 2008-06-19
Temporary work-around for Bug#36403 Compiling Falcon on Solaris fails due to dtrace
To avoid that other people compiling on Solaris have problems with linking
the two DTrace probes found in Falcon we temporarily comment these out
of the code.
Before these should be enabled again there need to be done some work
on how configure and make do linking of DTrace probes for the storage
engines.
modified:
storage/falcon/ha_falcon.cpp
2711 Kevin Lewis 2008-06-17
Replace CRLF with LF
modified:
storage/falcon/SectorBuffer.cpp
storage/falcon/SectorBuffer.h
storage/falcon/SectorCache.cpp
storage/falcon/SectorCache.h
2710 Kevin Lewis 2008-06-17
Replace CRLF with LF
modified:
storage/falcon/DataOverflowPage.h
2709 Kevin Lewis 2008-06-17
Replace CRLF with LF
modified:
storage/falcon/DataOverflowPage.cpp
2708 Kevin Lewis 2008-06-17
Bug#36468 - Make sure that Transaction::commit gets a lock on both the
active and committed transaction lists before it moves a transaction
from on to the other.
modified:
storage/falcon/Transaction.cpp
storage/falcon/TransactionManager.cpp
2707 Kevin Lewis 2008-06-17
Replace CRLF with LF and other cleanup
modified:
storage/falcon/Backup.cpp
storage/falcon/Backup.h
storage/falcon/DataPage.cpp
storage/falcon/DataPage.h
storage/falcon/Database.cpp
storage/falcon/EncodedDataStream.h
storage/falcon/Gopher.cpp
storage/falcon/Hdr.cpp
storage/falcon/Hdr.h
storage/falcon/IndexPage.cpp
storage/falcon/IndexPage.h
storage/falcon/InversionPage.cpp
storage/falcon/InversionPage.h
storage/falcon/Page.h
storage/falcon/PageInventoryPage.cpp
storage/falcon/PageInventoryPage.h
storage/falcon/RecordLocatorPage.cpp
storage/falcon/RecordLocatorPage.h
storage/falcon/Section.cpp
storage/falcon/SectionPage.cpp
storage/falcon/SectionPage.h
storage/falcon/TableSpaceManager.cpp
2706 Vladislav Vaintroub 2008-06-17
Always output Falcon assertion info to mysql error log.
Feature was requested by system-qa.
modified:
storage/falcon/Error.cpp
storage/falcon/Error.h
2705 Vladislav Vaintroub 2008-06-17 [merge]
something I pulled
modified:
Makefile.am
config/ac-macros/libevent.m4
2704 Vladislav Vaintroub 2008-06-16
Bug#37251 - Livelock between UPDATE and DELETE threads
The problem was a bug in deadlock detection code.
2 threads with mutual dependencies doing deadlock at exactly
same time both decide there is no deadlock, add themselves
to waitFor list, thus building a cycle in it. Both threads
will wait for each other until lock wait timeout happens
(a deadlock). Meanwhile, any other thread that traverses
waitFor list may enter the cycle described above and will
loop until deadlock is resolved.
Solution here is to modify deadlock detection to add dependency
first, than check, then remove dependency if cycle is found.
Care is taken to prevent compiler optimizations and hopefully
the combination of volatile specifier and COMPARE_EXHANGE will
generate a memory barrier to prevent reading elements while
they are modified.
Note, that instead of this fancy solution, plain old SyncObject
could be used. The loop is short, the lock is cheap,
but I can't estimate contention for the moment. If current lock-free
implementation turns out to be buggy, this alternative can be
considered.
No testcase provided, the situation described in bug report
can not be reliably reproduced.
modified:
storage/falcon/Transaction.cpp
storage/falcon/Transaction.h
2703 Hakan Kuecuekyilmaz 2008-06-16
Merged from main.
2702 Hakan Kuecuekyilmaz 2008-06-16 [merge]
Merged from main.
removed:
.bzr-mysql/
.bzr-mysql/default.conf
added:
.bzr-mysql/
.bzr-mysql/default.conf
BUILD/compile-pentium-valgrind-max-no-ndb
mysql-test/r/lowercase_utf8.result
mysql-test/t/lowercase_utf8-master.opt
mysql-test/t/lowercase_utf8.test
modified:
client/sql_string.cc
client/sql_string.h
configure.in
include/config-win.h
include/my_global.h
include/mysql_com.h
libmysqld/lib_sql.cc
mysql-test/mysql-test-run.pl
mysql-test/r/bigint.result
mysql-test/r/comments.result
mysql-test/r/ctype_utf8.result
mysql-test/r/errors.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/max_prepared_stmt_count_func.result
mysql-test/r/myisam.result
mysql-test/r/parser.result
mysql-test/r/ps.result
mysql-test/r/query_cache.result
mysql-test/r/sp-code.result
mysql-test/r/sp-error.result
mysql-test/r/sp-vars.result
mysql-test/r/sp.result
mysql-test/r/status.result
mysql-test/r/strict.result
mysql-test/r/subselect.result
mysql-test/r/subselect2.result
mysql-test/r/subselect_mat.result
mysql-test/r/subselect_no_mat.result
mysql-test/r/subselect_no_opts.result
mysql-test/r/subselect_no_semijoin.result
mysql-test/r/subselect_notembedded.result
mysql-test/r/subselect_sj.result
mysql-test/r/subselect_sj2.result
mysql-test/r/type_blob.result
mysql-test/r/type_newdecimal.result
mysql-test/r/type_ranges.result
mysql-test/r/udf.result
mysql-test/r/varbinary.result
mysql-test/r/view.result
mysql-test/r/warnings.result
mysql-test/suite/funcs_1/r/falcon_storedproc.result
mysql-test/suite/funcs_1/r/falcon_storedproc_02.result
mysql-test/suite/funcs_1/r/falcon_storedproc_06.result
mysql-test/suite/funcs_1/r/innodb_func_view.result
mysql-test/suite/funcs_1/r/innodb_storedproc.result
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
mysql-test/suite/funcs_1/r/memory_func_view.result
mysql-test/suite/funcs_1/r/memory_storedproc.result
mysql-test/suite/funcs_1/r/memory_storedproc_02.result
mysql-test/suite/funcs_1/r/myisam_func_view.result
mysql-test/suite/funcs_1/r/myisam_storedproc.result
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
mysql-test/suite/funcs_1/r/ndb_storedproc.result
mysql-test/suite/funcs_1/r/ndb_storedproc_02.result
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc
mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
mysql-test/suite/rpl/r/rpl_slave_status.result
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test
mysql-test/suite/rpl/t/rpl_server_id1.test
mysql-test/suite/rpl/t/rpl_slave_status.test
mysql-test/t/ctype_utf8.test
mysql-test/t/disabled.def
mysql-test/t/func_math.test
mysql-test/t/func_misc.test
mysql-test/t/myisam.test
mysql-test/t/parser.test
mysql-test/t/ps_ddl.test
mysql-test/t/query_cache.test
mysql-test/t/sp.test
mysql-test/t/status.test
mysql-test/t/subselect.test
mysql-test/t/subselect2.test
mysql-test/t/subselect_mat.test
mysql-test/t/subselect_notembedded.test
mysql-test/t/subselect_sj.test
mysql-test/t/subselect_sj2.test
mysql-test/t/type_blob.test
mysql-test/t/udf.test
mysql-test/t/varbinary.test
sql/item.cc
sql/item.h
sql/item_cmpfunc.cc
sql/item_func.cc
sql/item_subselect.cc
sql/item_subselect.h
sql/my_decimal.cc
sql/mysqld.cc
sql/opt_range.cc
sql/opt_range.h
sql/share/charsets/README
sql/share/errmsg.txt
sql/sp_head.cc
sql/sql_base.cc
sql/sql_class.h
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_parse.cc
sql/sql_prepare.cc
sql/sql_select.cc
sql/sql_show.cc
sql/sql_string.cc
sql/sql_string.h
sql/sql_table.cc
sql/sql_yacc.yy
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp
strings/CHARSET_INFO.txt
strings/dtoa.c
support-files/build-tags
2701 Hakan Kuecuekyilmaz 2008-06-15
Fix for Bug#16902.
modified:
mysys/errors.c
2700 Hakan Kuecuekyilmaz 2008-06-14
Fixed test case falcon_bug_26828.test. This fixes Bug#37078.
modified:
mysql-test/suite/falcon/r/falcon_bug_26828.result
mysql-test/suite/falcon/t/falcon_bug_26828.test
2699 Vladislav Vaintroub 2008-06-11
Bug#37080 - Falcon deadlock on concurrent insert and truncate
Problem:
Two threads, one processing TRUNCATE and gopher processing INSERT acquire
the same locks, SerlialLog::syncSections and Table::syncObject in different
order
Solution:
Rearrange locks, so that syncSections is always locked before
Table::syncObject. For this, move lock to syncSection from
SRLDropTable::append() up the stack, into to Database::dropTable()
Database::truncateTable()
added:
mysql-test/suite/falcon/r/falcon_bug_37080.result
mysql-test/suite/falcon/t/falcon_bug_37080.test
modified:
storage/falcon/Database.cpp
storage/falcon/SRLDropTable.cpp
2698 John H. Embretsen 2008-06-11
Removed project_name setting to
a) avoid having commit mail subjects repeat "mysql-6.0-falcon"
(tree_name is appended to project_name if set)
b) align falcon settings with other trees
as suggested by Davi Arnaut in http://lists.mysql.com/commits/47570.
modified:
.bzr-mysql/default.conf
2697 Mats Kindahl 2008-06-10 [merge]
Merging.
modified:
storage/falcon/Gopher.cpp
storage/falcon/SRLDropTableSpace.cpp
storage/falcon/SerialLog.h
storage/falcon/SerialLogTransaction.cpp
storage/falcon/SerialLogTransaction.h
storage/falcon/TableSpaceManager.cpp
storage/falcon/TableSpaceManager.h
2696 Mats Kindahl 2008-06-10
BUG#37221: SET AUTOCOMMIT=1 does not commit binary log
Adding comment to Falcon regression test for the bug.
modified:
mysql-test/suite/falcon/t/rpl_falcon_bug_37221.test
2695 Mats Kindahl 2008-06-09
Bug #37221: SET AUTOCOMMIT=1 does not commit binary log
When setting AUTOCOMMIT=1 after starting a transaction, the binary log
did not commit the outstanding transaction. The reason was that the binary
log commit function saw the values of the new settings, deciding that there
were nothing to commit.
Fixed the problem by moving the implicit commit to before the thread option
flags were changed, so that the binary log sees the old values of the flags
instead of the values they will take after the statement.
added:
mysql-test/extra/binlog_tests/implicit.test
mysql-test/suite/binlog/r/binlog_implicit_commit.result
mysql-test/suite/binlog/t/binlog_implicit_commit.test
mysql-test/suite/falcon/r/rpl_falcon_bug_37221.result
mysql-test/suite/falcon/t/rpl_falcon_bug_37221.test
modified:
sql/set_var.cc
2694 Olav Sandstaa 2008-06-08
Fix to the second of the memory alignment issues in Bug#36745 falcon crash on
solaris
The problem that caused crashes on SPARC running in 64 bit mode was due a memory
aligment issue
when "nodes" were allocated in the DeferredIndex::initialSpace. Memory is allocated
in the
initialSpace starting from the end of the memory area. Since the end of the
initialSpace was not
aligned on an address boundary this resulted in that memory allocated from it was
not aligned and thus
crashed on Solaris when running in 64 bit mot on SPARC. Fixed this by ensuring that
the size
of the initialSpace is "8 byte memory aligned" (increased the size of it from 500
bytes to 512 bytes).
modified:
storage/falcon/DeferredIndex.h
2693 Olav Sandstaa 2008-06-07 [merge]
Committing the result of last merge into local repository. Should this really be
necessary?
added:
storage/falcon/SectorBuffer.cpp
storage/falcon/SectorBuffer.h
storage/falcon/SectorCache.cpp
storage/falcon/SectorCache.h
modified:
.bzr-mysql/default.conf
storage/falcon/Backup.cpp
storage/falcon/CMakeLists.txt
storage/falcon/Cache.cpp
storage/falcon/Cache.h
storage/falcon/Makefile.am
=== modified file 'Makefile.am'
--- a/Makefile.am 2008-08-05 12:23:37 +0000
+++ b/Makefile.am 2008-08-20 07:07:09 +0000
@@ -63,7 +63,7 @@ dist-hook:
--datadir=$(distdir)/win/data \
--srcdir=$(top_srcdir)
-all-local: abi_check
+all-local: @ABI_CHECK@
tags:
support-files/build-tags
@@ -270,8 +270,6 @@ TEST_PREPROCESSOR_HEADER = $(top_srcdir)
# to prevent seeing these messages.
# 2) sed the output to
# 2.1) remove blank lines and lines that begin with "# "
-# (The header information is retained to enable easy
-# analysis of abi diffs at a later stage).
# 2.2) When gcc -E is run on the Mac OS and solaris sparc platforms it
# introduces a line of output that shows up as a difference between
# the .pp and .out files. Remove these OS specific preprocessor text
=== modified file 'configure.in'
--- a/configure.in 2008-08-13 07:37:20 +0000
+++ b/configure.in 2008-08-20 07:07:09 +0000
@@ -470,6 +470,17 @@ AC_SUBST(HOSTNAME)
AC_SUBST(PERL)
AC_SUBST(PERL5)
+# Enable the abi_check rule only if gcc is available
+
+if expr "$CC" : ".*gcc.*"
+then
+ ABI_CHECK="abi_check"
+else
+ ABI_CHECK=""
+fi
+
+AC_SUBST(ABI_CHECK)
+
# Lock for PS
AC_PATH_PROG(PS, ps, ps)
AC_MSG_CHECKING("how to check if pid exists")
=== modified file 'mysql-test/extra/binlog_tests/binlog_insert_delayed.test'
--- a/mysql-test/extra/binlog_tests/binlog_insert_delayed.test 2007-03-29 19:38:03 +0000
+++ b/mysql-test/extra/binlog_tests/binlog_insert_delayed.test 2008-07-23 16:56:39 +0000
@@ -1,17 +1,43 @@
-# Test of binlogging of INSERT_ID with INSERT DELAYED
+# ==== Purpose ====
+#
+# Verify that INSERT DELAYED in mixed or row mode writes events to the
+# binlog, and that AUTO_INCREMENT works correctly.
+#
+# ==== Method ====
+#
+# Insert both single and multiple rows into an autoincrement column,
+# both with specified value and with NULL.
+#
+# With INSERT DELAYED, the rows do not show up in the table
+# immediately, so we must do source include/wait_until_rows_count.inc
+# between any two INSERT DELAYED statements. Moreover, if mixed or
+# row-based logging is used, there is also a delay between when rows
+# show up in the table and when they show up in the binlog. To ensure
+# that the rows show up in the binlog, we call FLUSH TABLES, which
+# waits until the delayed_insert thread has finished.
+#
+# We cannot read the binlog after executing INSERT DELAYED statements
+# that insert multiple rows, because that is nondeterministic. More
+# precisely, rows may be written in batches to the binlog, where each
+# batch has one Table_map_log_event and one or more
+# Write_rows_log_event. The number of rows included in each batch is
+# nondeterministic.
+#
+# ==== Related bugs ====
+#
+# BUG#20627: INSERT DELAYED does not honour auto_increment_* variables
+# Bug in this test: BUG#38068: binlog_stm_binlog fails sporadically in pushbuild
+
+
create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;
-# First, avoid BUG#20627:
-set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1;
-# Verify that only one INSERT_ID event is binlogged.
-# Note, that because of WL#3368 mixed mode binlog records RBR events for the delayed
-let $table=t1;
-let $rows_inserted=11; # total number of inserted rows in this test
-insert delayed into t1 values (207);
-let $count=1;
-# use this macro instead of sleeps.
+let $table=t1;
+let $count=0;
+insert delayed into t1 values (207);
+inc $count;
--source include/wait_until_rows_count.inc
+
insert delayed into t1 values (null);
inc $count;
--source include/wait_until_rows_count.inc
@@ -20,9 +46,10 @@ insert delayed into t1 values (300);
inc $count;
--source include/wait_until_rows_count.inc
-# moving binlog check affront of multi-rows queries which work is indeterministic (extra
table_maps)
-# todo: better check is to substitute SHOW BINLOG with reading from binlog, probably
bug#19459 is in
-# the way
+# It is not enough to wait until all rows have been inserted into the
+# table. FLUSH TABLES ensures that they are in the binlog too. See
+# comment above.
+FLUSH TABLES;
source include/show_binlog_events.inc;
insert delayed into t1 values (null),(null),(null),(null);
@@ -33,8 +60,5 @@ insert delayed into t1 values (null),(nu
inc $count; inc $count; inc $count; inc $count;
--source include/wait_until_rows_count.inc
-#check this assertion about $count calculation
---echo $count == $rows_inserted
-
select * from t1;
drop table t1;
=== modified file 'mysql-test/extra/rpl_tests/rpl_row_basic.test'
--- a/mysql-test/extra/rpl_tests/rpl_row_basic.test 2008-07-25 15:10:14 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_row_basic.test 2008-08-18 18:12:46 +0000
@@ -309,46 +309,46 @@ sync_slave_with_master;
# 7. Replicating UTF-8 CHAR(255) to CHAR(255) UTF-8
connection master;
-CREATE TABLE t1 (i INT NOT NULL,
- c CHAR(16) CHARACTER SET utf8 NOT NULL,
- j INT NOT NULL);
-
-CREATE TABLE t2 (i INT NOT NULL,
- c CHAR(16) CHARACTER SET utf8 NOT NULL,
- j INT NOT NULL);
+eval CREATE TABLE t1 (i INT NOT NULL,
+ c CHAR(16) CHARACTER SET utf8 NOT NULL,
+ j INT NOT NULL) ENGINE = $type ;
+
+eval CREATE TABLE t2 (i INT NOT NULL,
+ c CHAR(16) CHARACTER SET utf8 NOT NULL,
+ j INT NOT NULL) ENGINE = $type ;
sync_slave_with_master;
ALTER TABLE t2 MODIFY c CHAR(128) CHARACTER SET utf8 NOT NULL;
connection master;
-CREATE TABLE t3 (i INT NOT NULL,
- c CHAR(128) CHARACTER SET utf8 NOT NULL,
- j INT NOT NULL);
+eval CREATE TABLE t3 (i INT NOT NULL,
+ c CHAR(128) CHARACTER SET utf8 NOT NULL,
+ j INT NOT NULL) ENGINE = $type ;
sync_slave_with_master;
ALTER TABLE t3 MODIFY c CHAR(16) CHARACTER SET utf8 NOT NULL;
connection master;
-CREATE TABLE t4 (i INT NOT NULL,
- c CHAR(128) CHARACTER SET utf8 NOT NULL,
- j INT NOT NULL);
-
-CREATE TABLE t5 (i INT NOT NULL,
- c CHAR(255) CHARACTER SET utf8 NOT NULL,
- j INT NOT NULL);
+eval CREATE TABLE t4 (i INT NOT NULL,
+ c CHAR(128) CHARACTER SET utf8 NOT NULL,
+ j INT NOT NULL) ENGINE = $type ;
+
+eval CREATE TABLE t5 (i INT NOT NULL,
+ c CHAR(255) CHARACTER SET utf8 NOT NULL,
+ j INT NOT NULL) ENGINE = $type ;
sync_slave_with_master;
ALTER TABLE t5 MODIFY c CHAR(16) CHARACTER SET utf8 NOT NULL;
connection master;
-CREATE TABLE t6 (i INT NOT NULL,
- c CHAR(255) CHARACTER SET utf8 NOT NULL,
- j INT NOT NULL);
+eval CREATE TABLE t6 (i INT NOT NULL,
+ c CHAR(255) CHARACTER SET utf8 NOT NULL,
+ j INT NOT NULL) ENGINE = $type ;
sync_slave_with_master;
ALTER TABLE t6 MODIFY c CHAR(128) CHARACTER SET utf8 NOT NULL;
connection master;
-CREATE TABLE t7 (i INT NOT NULL,
- c CHAR(255) CHARACTER SET utf8 NOT NULL,
- j INT NOT NULL);
+eval CREATE TABLE t7 (i INT NOT NULL,
+ c CHAR(255) CHARACTER SET utf8 NOT NULL,
+ j INT NOT NULL) ENGINE = $type ;
--echo [expecting slave to replicate correctly]
connection master;
@@ -381,7 +381,11 @@ let $last_error = query_get_value("SHOW
disable_query_log;
eval SELECT "$last_error" AS Last_SQL_Error;
enable_query_log;
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=8;
+connection master;
+RESET MASTER;
+connection slave;
+STOP SLAVE;
+RESET SLAVE;
START SLAVE;
source include/wait_for_slave_to_start.inc;
@@ -406,7 +410,11 @@ let $last_error = query_get_value("SHOW
disable_query_log;
eval SELECT "$last_error" AS Last_SQL_Error;
enable_query_log;
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=8;
+connection master;
+RESET MASTER;
+connection slave;
+STOP SLAVE;
+RESET SLAVE;
START SLAVE;
source include/wait_for_slave_to_start.inc;
@@ -421,7 +429,11 @@ let $last_error = query_get_value("SHOW
disable_query_log;
eval SELECT "$last_error" AS Last_SQL_Error;
enable_query_log;
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=8;
+connection master;
+RESET MASTER;
+connection slave;
+STOP SLAVE;
+RESET SLAVE;
START SLAVE;
source include/wait_for_slave_to_start.inc;
=== modified file 'mysql-test/include/show_binlog_events.inc'
--- a/mysql-test/include/show_binlog_events.inc 2008-04-01 15:13:57 +0000
+++ b/mysql-test/include/show_binlog_events.inc 2008-08-18 18:12:46 +0000
@@ -4,7 +4,7 @@ if (!$binlog_start)
{
let $binlog_start=107;
}
---replace_result $binlog_start <binlog_start>
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR $binlog_start <binlog_start>
--replace_column 2 # 4 # 5 #
---replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
/file_id=[0-9]+/file_id=#/
+--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
/file_id=[0-9]+/file_id=#/ /block_len=[0-9]+/block_len=#/
--eval show binlog events from $binlog_start
=== added file 'mysql-test/r/innodb-autoinc-optimize.result'
--- a/mysql-test/r/innodb-autoinc-optimize.result 1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/innodb-autoinc-optimize.result 2008-08-18 18:12:46 +0000
@@ -0,0 +1,6 @@
+drop table if exists t1;
+create table t1(a int not null auto_increment primary key) engine=innodb;
+insert into t1 set a = -1;
+optimize table t1;
+Table Op Msg_type Msg_text
+test.t1 optimize status OK
=== modified file 'mysql-test/suite/binlog/r/binlog_killed_simulate.result'
--- a/mysql-test/suite/binlog/r/binlog_killed_simulate.result 2008-01-29 13:43:41 +0000
+++ b/mysql-test/suite/binlog/r/binlog_killed_simulate.result 2008-07-29 15:36:13 +0000
@@ -18,7 +18,7 @@ load data infile '../std_data_ln/rpl_loa
ERROR 70100: Query execution was interrupted
show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=12
+master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=#
master-bin.000001 # Execute_load_query # # use `test`; load data infile
'../std_data_ln/rpl_loaddata.dat' into table t2 /* will be "killed" in the middle */
;file_id=#
select
(@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
=== modified file 'mysql-test/suite/binlog/r/binlog_row_binlog.result'
--- a/mysql-test/suite/binlog/r/binlog_row_binlog.result 2008-04-02 13:14:23 +0000
+++ b/mysql-test/suite/binlog/r/binlog_row_binlog.result 2008-08-18 18:12:46 +0000
@@ -1141,10 +1141,10 @@ master-bin.000001 # Delete_rows # # tabl
master-bin.000001 # Query # # use `mysql`; COMMIT
drop table t1,t2,t3,tt1;
create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;
-set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1;
insert delayed into t1 values (207);
insert delayed into t1 values (null);
insert delayed into t1 values (300);
+FLUSH TABLES;
show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # use `test`; create table t1 (id tinyint auto_increment
primary key)
@@ -1188,9 +1188,9 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # use `test`; COMMIT
+master-bin.000001 # Query # # use `test`; FLUSH TABLES
insert delayed into t1 values (null),(null),(null),(null);
insert delayed into t1 values (null),(null),(400),(null);
-11 == 11
select * from t1;
a
207
=== modified file 'mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result'
--- a/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result 2008-05-09 10:27:23
+0000
+++ b/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result 2008-08-18 18:12:46
+0000
@@ -927,7 +927,7 @@ Log_name Pos Event_type Server_id End_lo
master-bin.000001 # Query # # use `test`; BEGIN
master-bin.000001 # Intvar # # INSERT_ID=10
master-bin.000001 # User var # # @`b`=_latin1 0x3135 COLLATE latin1_swedish_ci
-master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=12
+master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=#
master-bin.000001 # Intvar # # INSERT_ID=10
master-bin.000001 # User var # # @`b`=_latin1 0x3135 COLLATE latin1_swedish_ci
master-bin.000001 # Execute_load_query # # use `test`; load data infile
'../std_data_ln/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2)
;file_id=#
=== modified file 'mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result'
--- a/mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result 2007-06-27 12:28:02
+0000
+++ b/mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result 2008-07-29 15:36:13
+0000
@@ -1,8 +1,8 @@
create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;
-set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1;
insert delayed into t1 values (207);
insert delayed into t1 values (null);
insert delayed into t1 values (300);
+FLUSH TABLES;
show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # use `test`; create table t1 (a int not null auto_increment,
primary key (a)) engine=myisam
@@ -10,9 +10,9 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Intvar # # INSERT_ID=208
master-bin.000001 # Query # # use `test`; insert delayed into t1 values (null)
master-bin.000001 # Query # # use `test`; insert delayed into t1 values (300)
+master-bin.000001 # Query # # use `test`; FLUSH TABLES
insert delayed into t1 values (null),(null),(null),(null);
insert delayed into t1 values (null),(null),(400),(null);
-11 == 11
select * from t1;
a
207
=== modified file 'mysql-test/suite/binlog/r/binlog_stm_binlog.result'
--- a/mysql-test/suite/binlog/r/binlog_stm_binlog.result 2008-04-01 15:13:57 +0000
+++ b/mysql-test/suite/binlog/r/binlog_stm_binlog.result 2008-08-18 18:12:46 +0000
@@ -629,10 +629,10 @@ master-bin.000001 # Query # # use `mysql
master-bin.000001 # Query # # use `mysql`; DELETE FROM user WHERE host='localhost' AND
user='@#@'
drop table t1,t2,t3,tt1;
create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;
-set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1;
insert delayed into t1 values (207);
insert delayed into t1 values (null);
insert delayed into t1 values (300);
+FLUSH TABLES;
show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # use `test`; create table t1 (id tinyint auto_increment
primary key)
@@ -660,9 +660,9 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # use `test`; COMMIT
+master-bin.000001 # Query # # use `test`; FLUSH TABLES
insert delayed into t1 values (null),(null),(null),(null);
insert delayed into t1 values (null),(null),(400),(null);
-11 == 11
select * from t1;
a
207
=== modified file 'mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result'
--- a/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result 2008-05-09 10:27:23
+0000
+++ b/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result 2008-08-18 18:12:46
+0000
@@ -624,7 +624,7 @@ show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # use `test`; BEGIN
master-bin.000001 # Intvar # # INSERT_ID=10
-master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=12
+master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=#
master-bin.000001 # Intvar # # INSERT_ID=10
master-bin.000001 # Execute_load_query # # use `test`; load data infile
'../std_data_ln/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2)
;file_id=#
master-bin.000001 # Query # # use `test`; ROLLBACK
@@ -859,7 +859,7 @@ Log_name Pos Event_type Server_id End_lo
master-bin.000001 # Query # # use `test`; BEGIN
master-bin.000001 # Intvar # # INSERT_ID=10
master-bin.000001 # User var # # @`b`=_latin1 0x3135 COLLATE latin1_swedish_ci
-master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=12
+master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=#
master-bin.000001 # Intvar # # INSERT_ID=10
master-bin.000001 # User var # # @`b`=_latin1 0x3135 COLLATE latin1_swedish_ci
master-bin.000001 # Execute_load_query # # use `test`; load data infile
'../std_data_ln/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2)
;file_id=#
=== modified file 'mysql-test/suite/rpl/r/rpl_loaddata_map.result'
--- a/mysql-test/suite/rpl/r/rpl_loaddata_map.result 2008-02-07 06:33:07 +0000
+++ b/mysql-test/suite/rpl/r/rpl_loaddata_map.result 2008-08-18 18:12:46 +0000
@@ -4,6 +4,8 @@ reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
+==== Create a big file ====
+==== Load our big file into a table ====
create table t2 (id int not null primary key auto_increment);
select @@session.read_buffer_size - @@session.max_allowed_packet > 0 ;
@@session.read_buffer_size - @@session.max_allowed_packet > 0
@@ -12,15 +14,18 @@ load data infile 'MYSQLTEST_VARDIR/tmp/b
select count(*) from t2 /* 5 000 */;
count(*)
5000
-show binlog events in 'master-bin.000002' from <binlog_start>;
+show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000002 # Query # # use `test`; create table t2 (id int not null primary key
auto_increment)
-master-bin.000002 # Begin_load_query # # ;file_id=#;block_len=#
-master-bin.000002 # Append_block # # ;file_id=#;block_len=#
-master-bin.000002 # Append_block # # ;file_id=#;block_len=#
-master-bin.000002 # Execute_load_query # # use `test`; load data infile
'MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' into table t2 ;file_id=#
+master-bin.000001 # Query # # use `test`; create table t2 (id int not null primary key
auto_increment)
+master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=#
+master-bin.000001 # Append_block # # ;file_id=#;block_len=#
+master-bin.000001 # Append_block # # ;file_id=#;block_len=#
+master-bin.000001 # Execute_load_query # # use `test`; load data infile
'MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' into table t2 ;file_id=#
+==== Verify results on slave ====
+[on slave]
select count(*) from t2 /* 5 000 */;
count(*)
5000
-drop table t1, t2;
-end of the tests
+==== Clean up ====
+[on master]
+drop table t2;
=== modified file 'mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result 2008-07-21 03:55:09 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result 2008-08-18 18:12:46 +0000
@@ -453,29 +453,29 @@ a b c
DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8;
CREATE TABLE t1 (i INT NOT NULL,
c CHAR(16) CHARACTER SET utf8 NOT NULL,
-j INT NOT NULL);
+j INT NOT NULL) ENGINE = 'MYISAM' ;
CREATE TABLE t2 (i INT NOT NULL,
c CHAR(16) CHARACTER SET utf8 NOT NULL,
-j INT NOT NULL);
+j INT NOT NULL) ENGINE = 'MYISAM' ;
ALTER TABLE t2 MODIFY c CHAR(128) CHARACTER SET utf8 NOT NULL;
CREATE TABLE t3 (i INT NOT NULL,
c CHAR(128) CHARACTER SET utf8 NOT NULL,
-j INT NOT NULL);
+j INT NOT NULL) ENGINE = 'MYISAM' ;
ALTER TABLE t3 MODIFY c CHAR(16) CHARACTER SET utf8 NOT NULL;
CREATE TABLE t4 (i INT NOT NULL,
c CHAR(128) CHARACTER SET utf8 NOT NULL,
-j INT NOT NULL);
+j INT NOT NULL) ENGINE = 'MYISAM' ;
CREATE TABLE t5 (i INT NOT NULL,
c CHAR(255) CHARACTER SET utf8 NOT NULL,
-j INT NOT NULL);
+j INT NOT NULL) ENGINE = 'MYISAM' ;
ALTER TABLE t5 MODIFY c CHAR(16) CHARACTER SET utf8 NOT NULL;
CREATE TABLE t6 (i INT NOT NULL,
c CHAR(255) CHARACTER SET utf8 NOT NULL,
-j INT NOT NULL);
+j INT NOT NULL) ENGINE = 'MYISAM' ;
ALTER TABLE t6 MODIFY c CHAR(128) CHARACTER SET utf8 NOT NULL;
CREATE TABLE t7 (i INT NOT NULL,
c CHAR(255) CHARACTER SET utf8 NOT NULL,
-j INT NOT NULL);
+j INT NOT NULL) ENGINE = 'MYISAM' ;
[expecting slave to replicate correctly]
INSERT INTO t1 VALUES (1, "", 1);
INSERT INTO t1 VALUES (2, repeat(_utf8'a', 16), 2);
@@ -489,7 +489,9 @@ INSERT INTO t3 VALUES (1, "", 1);
INSERT INTO t3 VALUES (2, repeat(_utf8'a', 128), 2);
Last_SQL_Error
Table definition on master and slave does not match: Column 1 size mismatch - master has
size 512, test.t3 on slave has size 65. Master's column size should be <= the slave's
column size.
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=8;
+RESET MASTER;
+STOP SLAVE;
+RESET SLAVE;
START SLAVE;
[expecting slave to replicate correctly]
INSERT INTO t4 VALUES (1, "", 1);
@@ -500,14 +502,18 @@ INSERT INTO t5 VALUES (1, "", 1);
INSERT INTO t5 VALUES (2, repeat(_utf8'a', 255), 2);
Last_SQL_Error
Table definition on master and slave does not match: Column 1 size mismatch - master has
size 1020, test.t5 on slave has size 65. Master's column size should be <= the slave's
column size.
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=8;
+RESET MASTER;
+STOP SLAVE;
+RESET SLAVE;
START SLAVE;
[expecting slave to stop]
INSERT INTO t6 VALUES (1, "", 1);
INSERT INTO t6 VALUES (2, repeat(_utf8'a', 255), 2);
Last_SQL_Error
Table definition on master and slave does not match: Column 1 size mismatch - master has
size 1020, test.t6 on slave has size 513. Master's column size should be <= the
slave's column size.
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=8;
+RESET MASTER;
+STOP SLAVE;
+RESET SLAVE;
START SLAVE;
[expecting slave to replicate correctly]
INSERT INTO t7 VALUES (1, "", 1);
=== modified file 'mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result 2008-07-21 03:55:09 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result 2008-08-18 18:12:46 +0000
@@ -453,29 +453,29 @@ a b c
DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8;
CREATE TABLE t1 (i INT NOT NULL,
c CHAR(16) CHARACTER SET utf8 NOT NULL,
-j INT NOT NULL);
+j INT NOT NULL) ENGINE = 'INNODB' ;
CREATE TABLE t2 (i INT NOT NULL,
c CHAR(16) CHARACTER SET utf8 NOT NULL,
-j INT NOT NULL);
+j INT NOT NULL) ENGINE = 'INNODB' ;
ALTER TABLE t2 MODIFY c CHAR(128) CHARACTER SET utf8 NOT NULL;
CREATE TABLE t3 (i INT NOT NULL,
c CHAR(128) CHARACTER SET utf8 NOT NULL,
-j INT NOT NULL);
+j INT NOT NULL) ENGINE = 'INNODB' ;
ALTER TABLE t3 MODIFY c CHAR(16) CHARACTER SET utf8 NOT NULL;
CREATE TABLE t4 (i INT NOT NULL,
c CHAR(128) CHARACTER SET utf8 NOT NULL,
-j INT NOT NULL);
+j INT NOT NULL) ENGINE = 'INNODB' ;
CREATE TABLE t5 (i INT NOT NULL,
c CHAR(255) CHARACTER SET utf8 NOT NULL,
-j INT NOT NULL);
+j INT NOT NULL) ENGINE = 'INNODB' ;
ALTER TABLE t5 MODIFY c CHAR(16) CHARACTER SET utf8 NOT NULL;
CREATE TABLE t6 (i INT NOT NULL,
c CHAR(255) CHARACTER SET utf8 NOT NULL,
-j INT NOT NULL);
+j INT NOT NULL) ENGINE = 'INNODB' ;
ALTER TABLE t6 MODIFY c CHAR(128) CHARACTER SET utf8 NOT NULL;
CREATE TABLE t7 (i INT NOT NULL,
c CHAR(255) CHARACTER SET utf8 NOT NULL,
-j INT NOT NULL);
+j INT NOT NULL) ENGINE = 'INNODB' ;
[expecting slave to replicate correctly]
INSERT INTO t1 VALUES (1, "", 1);
INSERT INTO t1 VALUES (2, repeat(_utf8'a', 16), 2);
@@ -489,7 +489,9 @@ INSERT INTO t3 VALUES (1, "", 1);
INSERT INTO t3 VALUES (2, repeat(_utf8'a', 128), 2);
Last_SQL_Error
Table definition on master and slave does not match: Column 1 size mismatch - master has
size 512, test.t3 on slave has size 65. Master's column size should be <= the slave's
column size.
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=8;
+RESET MASTER;
+STOP SLAVE;
+RESET SLAVE;
START SLAVE;
[expecting slave to replicate correctly]
INSERT INTO t4 VALUES (1, "", 1);
@@ -500,14 +502,18 @@ INSERT INTO t5 VALUES (1, "", 1);
INSERT INTO t5 VALUES (2, repeat(_utf8'a', 255), 2);
Last_SQL_Error
Table definition on master and slave does not match: Column 1 size mismatch - master has
size 1020, test.t5 on slave has size 65. Master's column size should be <= the slave's
column size.
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=8;
+RESET MASTER;
+STOP SLAVE;
+RESET SLAVE;
START SLAVE;
[expecting slave to stop]
INSERT INTO t6 VALUES (1, "", 1);
INSERT INTO t6 VALUES (2, repeat(_utf8'a', 255), 2);
Last_SQL_Error
Table definition on master and slave does not match: Column 1 size mismatch - master has
size 1020, test.t6 on slave has size 513. Master's column size should be <= the
slave's column size.
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=8;
+RESET MASTER;
+STOP SLAVE;
+RESET SLAVE;
START SLAVE;
[expecting slave to replicate correctly]
INSERT INTO t7 VALUES (1, "", 1);
=== modified file 'mysql-test/suite/rpl/r/rpl_stm_log.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_log.result 2008-02-12 10:27:52 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_log.result 2008-08-18 18:12:46 +0000
@@ -196,7 +196,7 @@ master-bin.000001 # Intvar # # INSERT_ID
master-bin.000001 # Query # # use `test`; insert into t1 values (NULL)
master-bin.000001 # Query # # use `test`; drop table t1
master-bin.000001 # Query # # use `test`; create table t1 (word char(20) not
null)ENGINE=MyISAM
-master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=581
+master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=#
master-bin.000001 # Execute_load_query # # use `test`; load data infile
'../std_data_ln/words.dat' into table t1 ignore 1 lines ;file_id=#
master-bin.000001 # Rotate # # master-bin.000002;pos=4
show binlog events in 'master-bin.000002';
=== modified file 'mysql-test/suite/rpl/r/rpl_variables.result'
--- a/mysql-test/suite/rpl/r/rpl_variables.result 2008-03-07 12:59:36 +0000
+++ b/mysql-test/suite/rpl/r/rpl_variables.result 2008-07-17 16:26:59 +0000
@@ -45,7 +45,7 @@ RESET SLAVE;
RESET MASTER;
START SLAVE;
[on slave]
-SET @@global.init_slave = 'ant';
+SET @@global.init_slave = 'SELECT 1';
[on master]
CREATE TABLE tstmt (id INT AUTO_INCREMENT PRIMARY KEY,
truth BOOLEAN,
@@ -66,9 +66,9 @@ SET @@global.sync_binlog = 2000000;
INSERT INTO tstmt(num) VALUES (@@global.sync_binlog);
SET @@global.sync_binlog = 3000000;
INSERT INTO tstmt(num) VALUES (@@global.sync_binlog);
-SET @@global.init_slave = 'bison';
+SET @@global.init_slave = 'SELECT 2';
INSERT INTO tstmt(text) VALUES (@@global.init_slave);
-SET @@global.init_slave = 'cat';
+SET @@global.init_slave = 'SELECT 3';
INSERT INTO tstmt(text) VALUES (@@global.init_slave);
SET @@global.slave_exec_mode = 'IDEMPOTENT';
INSERT INTO tstmt(text) VALUES (@@global.slave_exec_mode);
@@ -140,9 +140,9 @@ INSERT INTO tproc(num) VALUES (@@global.
SET @@global.sync_binlog = 3000000;
INSERT INTO tproc(num) VALUES (@@global.sync_binlog);
# string
-SET @@global.init_slave = 'bison';
+SET @@global.init_slave = 'SELECT 2';
INSERT INTO tproc(text) VALUES (@@global.init_slave);
-SET @@global.init_slave = 'cat';
+SET @@global.init_slave = 'SELECT 3';
INSERT INTO tproc(text) VALUES (@@global.init_slave);
# enumeration
SET @@global.slave_exec_mode = 'IDEMPOTENT';
@@ -226,9 +226,9 @@ INSERT INTO tfunc(num) VALUES (@@global.
SET @@global.sync_binlog = 3000000;
INSERT INTO tfunc(num) VALUES (@@global.sync_binlog);
# string
-SET @@global.init_slave = 'bison';
+SET @@global.init_slave = 'SELECT 2';
INSERT INTO tfunc(text) VALUES (@@global.init_slave);
-SET @@global.init_slave = 'cat';
+SET @@global.init_slave = 'SELECT 3';
INSERT INTO tfunc(text) VALUES (@@global.init_slave);
# enumeration
SET @@global.slave_exec_mode = 'IDEMPOTENT';
@@ -316,9 +316,9 @@ INSERT INTO ttrig(num) VALUES (@@global.
SET @@global.sync_binlog = 3000000;
INSERT INTO ttrig(num) VALUES (@@global.sync_binlog);
# string
-SET @@global.init_slave = 'bison';
+SET @@global.init_slave = 'SELECT 2';
INSERT INTO ttrig(text) VALUES (@@global.init_slave);
-SET @@global.init_slave = 'cat';
+SET @@global.init_slave = 'SELECT 3';
INSERT INTO ttrig(text) VALUES (@@global.init_slave);
# enumeration
SET @@global.slave_exec_mode = 'IDEMPOTENT';
@@ -395,9 +395,9 @@ PREPARE p5 FROM 'SET @@global.sync_binlo
PREPARE p6 FROM 'INSERT INTO tprep(num) VALUES (@@global.sync_binlog)';
PREPARE p7 FROM 'SET @@global.sync_binlog = 3000000';
PREPARE p8 FROM 'INSERT INTO tprep(num) VALUES (@@global.sync_binlog)';
-PREPARE p9 FROM 'SET @@global.init_slave = \'bison\'';
+PREPARE p9 FROM 'SET @@global.init_slave = \'SELECT 2\'';
PREPARE p10 FROM 'INSERT INTO tprep(text) VALUES (@@global.init_slave)';
-PREPARE p11 FROM 'SET @@global.init_slave = \'cat\'';
+PREPARE p11 FROM 'SET @@global.init_slave = \'SELECT 3\'';
PREPARE p12 FROM 'INSERT INTO tprep(text) VALUES (@@global.init_slave)';
PREPARE p13 FROM 'SET @@global.slave_exec_mode = \'IDEMPOTENT\'';
PREPARE p14 FROM 'INSERT INTO tprep(text) VALUES (@@global.slave_exec_mode)';
@@ -522,8 +522,8 @@ id truth num text
2 0 NULL NULL
3 NULL 2000000 NULL
4 NULL 3000000 NULL
-5 NULL NULL bison
-6 NULL NULL cat
+5 NULL NULL SELECT 2
+6 NULL NULL SELECT 3
7 NULL NULL IDEMPOTENT
8 NULL NULL STRICT
9 1 NULL NULL
=== modified file 'mysql-test/suite/rpl/t/disabled.def'
--- a/mysql-test/suite/rpl/t/disabled.def 2008-07-25 15:10:14 +0000
+++ b/mysql-test/suite/rpl/t/disabled.def 2008-08-18 18:12:46 +0000
@@ -29,8 +29,6 @@ rpl_log_pos : Bug#8693 Te
rpl_row_basic_7ndb : BUG#33360 2007-12-19 mats rpl_ndb_idempotent fails due to
null field for table on slave side
rpl_redirect : Failure is sporadic and and the test is superfluous (mats)
rpl_innodb_bug28430 : Failure on Solaris Bug #36793
-rpl_row_basic_2myisam : Bug#37879 2008-07-14 alik Disabled to make 6.0 greaner (the
test fails too often)
-rpl_row_basic_3innodb : Bug#37879 2008-07-14 alik Disabled to make 6.0 greaner (the
test fails too often)
rpl_heartbeat : Bug#37714 2008-07-14 alik Disabled to make 6.0 greaner (the
test fails too often)
rpl_idempotency : Bug#37767 2008-07-14 alik Disabled to make 6.0 greaner (the
test fails too often)
=== modified file 'mysql-test/suite/rpl/t/rpl_incident.test'
--- a/mysql-test/suite/rpl/t/rpl_incident.test 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_incident.test 2008-07-18 13:07:14 +0000
@@ -19,6 +19,37 @@ connection slave;
# The 4 should not be inserted into the table, since the incident log
# event should have stop the slave.
--echo **** On Slave ****
+#### BEGIN DEBUG INFO ADDED BY SVEN 2008-07-18 -- SEE BUG#38077 ####
+let $tables= query_get_value(SHOW TABLES, Tables_in_test, 1);
+if (`SELECT '$tables' != 't1'`)
+{
+ --echo **** TEST CASE BUG! PRINTING DEBUG INFO! ****
+ --echo **** Dear developer, if you see this in the output of a test
+ --echo **** case run, please add all the information below as a
+ --echo **** comment to BUG#38077. If it's a pushbuild failure, please
+ --echo **** include a link to the push page.
+ --echo **** Thank you! /Sven
+ SHOW BINLOG EVENTS;
+ --echo **** master binlog ****
+ --error 0,1
+ --exec $MYSQL_BINLOG --hexdump $MYSQLTEST_VARDIR/log/master-bin.000001
+ --echo **** slave binlog ****
+ --error 0,1
+ --exec $MYSQL_BINLOG --hexdump $MYSQLTEST_VARDIR/log/slave-bin.000001
+ --echo **** slave status ****
+ query_vertical SHOW SLAVE STATUS;
+ --echo **** slave's master status ****
+ SHOW MASTER STATUS;
+ --echo **** slave binlog events ****
+ --echo [on master]
+ connection master;
+ --echo **** master status ****
+ SHOW MASTER STATUS;
+ --echo **** master binlog events ****
+ SHOW BINLOG EVENTS;
+ exit;
+}
+#### END DEBUG INFO ####
SELECT * FROM t1;
--replace_result $MASTER_MYPORT MASTER_PORT
=== modified file 'mysql-test/suite/rpl/t/rpl_loaddata_map.test'
--- a/mysql-test/suite/rpl/t/rpl_loaddata_map.test 2008-02-05 14:30:44 +0000
+++ b/mysql-test/suite/rpl/t/rpl_loaddata_map.test 2008-08-18 18:12:46 +0000
@@ -1,7 +1,16 @@
+# ==== Purpose ====
#
# check replication of load data with the server parameters subjected to
# read_buffer_size > max_allowed_packet
#
+# ==== Implementation ====
+#
+# Insert many rows into t1, write t1 to file.
+# Load the file into t2.
+# See that t2 came out as expected on slave.
+#
+# ==== Related Bugs ====
+#
# BUG#30435 loading large LOAD DATA INFILE breaks slave with
# read_buffer_size set on master
# BUG#33413 show binlog events fails if binlog has event size of close
@@ -9,10 +18,17 @@
source include/have_binlog_format_mixed_or_statement.inc;
source include/master-slave.inc;
-source include/have_innodb.inc;
-source include/have_binlog_format_mixed_or_statement.inc;
+
+
+--echo ==== Create a big file ====
+
+# We turn off binlogging to avoid too much noise in the binlog. t1 is
+# just an auxiliary construction anyways, it is not needed on the
+# slave.
--disable_query_log
+SET @@sql_log_bin= 0;
+
let $rows= 5000;
create table t1 (id int not null primary key auto_increment);
@@ -22,10 +38,13 @@ while($rows)
dec $rows;
}
eval select * into outfile '$MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' from t1;
-flush logs;
+
+DROP TABLE t1;
+SET @@sql_log_bin= 1;
--enable_query_log
-connection master;
+
+--echo ==== Load our big file into a table ====
create table t2 (id int not null primary key auto_increment);
select @@session.read_buffer_size - @@session.max_allowed_packet > 0 ;
@@ -34,21 +53,21 @@ select @@session.read_buffer_size - @@se
eval load data infile '$MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' into table t2;
select count(*) from t2 /* 5 000 */;
-# the binglog will show fragmented Append_block events
---let $binlog_start=107
---replace_column 2 # 4 # 5 #
---replace_regex /\/\* xid=.* \*\//\/* XID *\// /file_id=[0-9]+/file_id=#/
/block_len=[0-9]+/block_len=#/
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR $binlog_start <binlog_start>
---eval show binlog events in 'master-bin.000002' from $binlog_start
+# the binlog will show fragmented Append_block events
+source include/show_binlog_events.inc;
+
+--echo ==== Verify results on slave ====
+--echo [on slave]
sync_slave_with_master;
-#connection slave;
select count(*) from t2 /* 5 000 */;
+
+--echo ==== Clean up ====
+
+--echo [on master]
connection master;
-drop table t1, t2;
+drop table t2;
sync_slave_with_master;
remove_file $MYSQLTEST_VARDIR/tmp/bug30435_5k.txt;
-
---echo end of the tests
=== removed file 'mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---binlog-format=row
=== removed file 'mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---binlog-format=statement --log-slave-updates
=== modified file 'mysql-test/suite/rpl/t/rpl_trunc_temp.test'
--- a/mysql-test/suite/rpl/t/rpl_trunc_temp.test 2008-02-28 11:36:14 +0000
+++ b/mysql-test/suite/rpl/t/rpl_trunc_temp.test 2008-07-23 10:13:55 +0000
@@ -1,13 +1,30 @@
-# Requires statement logging
+# ==== Purpose ====
+#
+# Verify that Slave_open_temp_tables is increased when a temporary
+# table is opened on the slave, and decreased when a temporary table
+# is closed on the slave, and that it is preserved during 'DELETE FROM
+# table' and 'TRUNCATE table'.
+#
+# ==== Method ====
+#
+# Create a temporary table on master, insert rows, and try:
+# - delete rows from the table
+# - truncate the table
+# - drop the table
+#
+# ==== Related bugs ====
+#
+# BUG#17137 Running "truncate table" on temporary table leaves the table open on a slave
+#
+# Bug in this test: BUG#37493: rpl_trunc_temp.test nondeterministic
+
+
+# Requires statement-based logging since temporary tables are not
+# logged in row-based logging
-- source include/have_binlog_format_mixed_or_statement.inc
source include/master-slave.inc;
-#
-# Bug#17137 Running "truncate table" on temporary table
-# leaves the table open on a slave
-#
-
create temporary table t1 (n int);
insert into t1 values(1);
sync_slave_with_master;
@@ -28,13 +45,10 @@ show status like 'Slave_open_temp_tables
# Disconnect the master, temp table on slave should dissapear
disconnect master;
-connection master1;
-# Wait until drop of temp tables appers in binlog
+connection slave;
+
+# Wait until drop of temp tables appers in slave's binlog
let $wait_binlog_event= DROP;
source include/wait_for_binlog_event.inc;
-connection slave;
show status like 'Slave_open_temp_tables';
-
-
-# End of 4.1 tests
=== modified file 'mysql-test/suite/rpl/t/rpl_variables.test'
--- a/mysql-test/suite/rpl/t/rpl_variables.test 2008-03-07 12:59:36 +0000
+++ b/mysql-test/suite/rpl/t/rpl_variables.test 2008-07-17 16:26:59 +0000
@@ -117,7 +117,7 @@ source include/reset_master_and_slave.in
# above, but can't because it affects how the slave works.
--echo [on slave]
connection slave;
-SET @@global.init_slave = 'ant';
+SET @@global.init_slave = 'SELECT 1';
--echo [on master]
@@ -154,9 +154,9 @@ SET @@global.sync_binlog = 3000000;
INSERT INTO tstmt(num) VALUES (@@global.sync_binlog);
# string
-SET @@global.init_slave = 'bison';
+SET @@global.init_slave = 'SELECT 2';
INSERT INTO tstmt(text) VALUES (@@global.init_slave);
-SET @@global.init_slave = 'cat';
+SET @@global.init_slave = 'SELECT 3';
INSERT INTO tstmt(text) VALUES (@@global.init_slave);
# enumeration
@@ -258,9 +258,9 @@ BEGIN
INSERT INTO tproc(num) VALUES (@@global.sync_binlog);
# string
- SET @@global.init_slave = 'bison';
+ SET @@global.init_slave = 'SELECT 2';
INSERT INTO tproc(text) VALUES (@@global.init_slave);
- SET @@global.init_slave = 'cat';
+ SET @@global.init_slave = 'SELECT 3';
INSERT INTO tproc(text) VALUES (@@global.init_slave);
# enumeration
@@ -367,9 +367,9 @@ BEGIN
INSERT INTO tfunc(num) VALUES (@@global.sync_binlog);
# string
- SET @@global.init_slave = 'bison';
+ SET @@global.init_slave = 'SELECT 2';
INSERT INTO tfunc(text) VALUES (@@global.init_slave);
- SET @@global.init_slave = 'cat';
+ SET @@global.init_slave = 'SELECT 3';
INSERT INTO tfunc(text) VALUES (@@global.init_slave);
# enumeration
@@ -478,9 +478,9 @@ BEGIN
INSERT INTO ttrig(num) VALUES (@@global.sync_binlog);
# string
- SET @@global.init_slave = 'bison';
+ SET @@global.init_slave = 'SELECT 2';
INSERT INTO ttrig(text) VALUES (@@global.init_slave);
- SET @@global.init_slave = 'cat';
+ SET @@global.init_slave = 'SELECT 3';
INSERT INTO ttrig(text) VALUES (@@global.init_slave);
# enumeration
@@ -581,9 +581,9 @@ PREPARE p7 FROM 'SET @@global.sync_binlo
PREPARE p8 FROM 'INSERT INTO tprep(num) VALUES (@@global.sync_binlog)';
# string
-PREPARE p9 FROM 'SET @@global.init_slave = \'bison\'';
+PREPARE p9 FROM 'SET @@global.init_slave = \'SELECT 2\'';
PREPARE p10 FROM 'INSERT INTO tprep(text) VALUES (@@global.init_slave)';
-PREPARE p11 FROM 'SET @@global.init_slave = \'cat\'';
+PREPARE p11 FROM 'SET @@global.init_slave = \'SELECT 3\'';
PREPARE p12 FROM 'INSERT INTO tprep(text) VALUES (@@global.init_slave)';
# enumeration
=== removed file 'mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt'
--- a/mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt 2008-06-26 05:18:28 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---binlog-format=mixed
=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test 2008-06-26 05:18:28 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test 2008-08-18 18:12:46 +0000
@@ -1,6 +1,6 @@
# Same test as rpl_truncate_7ndb.test, but with mixed mode
# This is marked with 'big_test' just because the rpl_truncate_7ndb test is
# so slow...
-
+--source include/have_binlog_format_mixed.inc
--source include/big_test.inc
--source suite/rpl_ndb/t/rpl_truncate_7ndb.test
=== modified file 'mysql-test/suite/rpl_ndb_big/r/rpl_row_basic_7ndb.result'
--- a/mysql-test/suite/rpl_ndb_big/r/rpl_row_basic_7ndb.result 2008-06-27 12:39:40 +0000
+++ b/mysql-test/suite/rpl_ndb_big/r/rpl_row_basic_7ndb.result 2008-08-18 18:12:46 +0000
@@ -437,7 +437,7 @@ SELECT COUNT(*) FROM t1 ORDER BY c1,c2;
COUNT(*) 0
set @@global.slave_exec_mode= default;
Last_SQL_Error
-0
+
SELECT COUNT(*) FROM t1 ORDER BY c1,c2;
COUNT(*) 0
**** Test for BUG#37076 ****
@@ -451,3 +451,72 @@ SELECT * FROM t1;
a b c
2005-11-14 01:01:01 2005-11-14 01:01:02 2005-11-14
DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8;
+CREATE TABLE t1 (i INT NOT NULL,
+c CHAR(16) CHARACTER SET utf8 NOT NULL,
+j INT NOT NULL) ENGINE = 'NDB' ;
+CREATE TABLE t2 (i INT NOT NULL,
+c CHAR(16) CHARACTER SET utf8 NOT NULL,
+j INT NOT NULL) ENGINE = 'NDB' ;
+ALTER TABLE t2 MODIFY c CHAR(128) CHARACTER SET utf8 NOT NULL;
+CREATE TABLE t3 (i INT NOT NULL,
+c CHAR(128) CHARACTER SET utf8 NOT NULL,
+j INT NOT NULL) ENGINE = 'NDB' ;
+ALTER TABLE t3 MODIFY c CHAR(16) CHARACTER SET utf8 NOT NULL;
+CREATE TABLE t4 (i INT NOT NULL,
+c CHAR(128) CHARACTER SET utf8 NOT NULL,
+j INT NOT NULL) ENGINE = 'NDB' ;
+CREATE TABLE t5 (i INT NOT NULL,
+c CHAR(255) CHARACTER SET utf8 NOT NULL,
+j INT NOT NULL) ENGINE = 'NDB' ;
+ALTER TABLE t5 MODIFY c CHAR(16) CHARACTER SET utf8 NOT NULL;
+CREATE TABLE t6 (i INT NOT NULL,
+c CHAR(255) CHARACTER SET utf8 NOT NULL,
+j INT NOT NULL) ENGINE = 'NDB' ;
+ALTER TABLE t6 MODIFY c CHAR(128) CHARACTER SET utf8 NOT NULL;
+CREATE TABLE t7 (i INT NOT NULL,
+c CHAR(255) CHARACTER SET utf8 NOT NULL,
+j INT NOT NULL) ENGINE = 'NDB' ;
+[expecting slave to replicate correctly]
+INSERT INTO t1 VALUES (1, "", 1);
+INSERT INTO t1 VALUES (2, repeat(_utf8'a', 16), 2);
+Comparing tables master:test.t1 and slave:test.t1
+[expecting slave to replicate correctly]
+INSERT INTO t2 VALUES (1, "", 1);
+INSERT INTO t2 VALUES (2, repeat(_utf8'a', 16), 2);
+Comparing tables master:test.t2 and slave:test.t2
+[expecting slave to stop]
+INSERT INTO t3 VALUES (1, "", 1);
+INSERT INTO t3 VALUES (2, repeat(_utf8'a', 128), 2);
+Last_SQL_Error
+Table definition on master and slave does not match: Column 1 size mismatch - master has
size 384, test.t3 on slave has size 49. Master's column size should be <= the slave's
column size.
+RESET MASTER;
+STOP SLAVE;
+RESET SLAVE;
+START SLAVE;
+[expecting slave to replicate correctly]
+INSERT INTO t4 VALUES (1, "", 1);
+INSERT INTO t4 VALUES (2, repeat(_utf8'a', 128), 2);
+Comparing tables master:test.t4 and slave:test.t4
+[expecting slave to stop]
+INSERT INTO t5 VALUES (1, "", 1);
+INSERT INTO t5 VALUES (2, repeat(_utf8'a', 255), 2);
+Last_SQL_Error
+Table definition on master and slave does not match: Column 1 size mismatch - master has
size 765, test.t5 on slave has size 49. Master's column size should be <= the slave's
column size.
+RESET MASTER;
+STOP SLAVE;
+RESET SLAVE;
+START SLAVE;
+[expecting slave to stop]
+INSERT INTO t6 VALUES (1, "", 1);
+INSERT INTO t6 VALUES (2, repeat(_utf8'a', 255), 2);
+Last_SQL_Error
+Table definition on master and slave does not match: Column 1 size mismatch - master has
size 765, test.t6 on slave has size 385. Master's column size should be <= the slave's
column size.
+RESET MASTER;
+STOP SLAVE;
+RESET SLAVE;
+START SLAVE;
+[expecting slave to replicate correctly]
+INSERT INTO t7 VALUES (1, "", 1);
+INSERT INTO t7 VALUES (2, repeat(_utf8'a', 255), 2);
+Comparing tables master:test.t7 and slave:test.t7
+drop table t1, t2, t3, t4, t5, t6, t7;
=== added file 'mysql-test/t/innodb-autoinc-optimize.test'
--- a/mysql-test/t/innodb-autoinc-optimize.test 1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/innodb-autoinc-optimize.test 2008-08-18 18:12:46 +0000
@@ -0,0 +1,16 @@
+-- source include/have_innodb.inc
+# embedded server ignores 'delayed', so skip this
+-- source include/not_embedded.inc
+
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+
+#
+# Bug 34286
+#
+create table t1(a int not null auto_increment primary key) engine=innodb;
+insert into t1 set a = -1;
+# NOTE: The database needs to be shutdown and restarted (here) for
+# the test to work. It's included for reference only.
+optimize table t1;
=== modified file 'sql/sql_binlog.cc'
--- a/sql/sql_binlog.cc 2008-05-23 13:54:03 +0000
+++ b/sql/sql_binlog.cc 2008-08-18 18:12:46 +0000
@@ -208,6 +208,7 @@ void mysql_client_binlog_statement(THD*
#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
if (apply_event_and_update_pos(ev, thd, thd->rli_fake, FALSE))
{
+ delete ev;
/*
TODO: Maybe a better error message since the BINLOG statement
now contains several events.
=== modified file 'sql/sql_cursor.cc'
--- a/sql/sql_cursor.cc 2008-08-11 13:45:45 +0000
+++ b/sql/sql_cursor.cc 2008-08-18 18:12:46 +0000
@@ -155,6 +155,7 @@ int mysql_open_cursor(THD *thd, uint fla
if (! (sensitive_cursor= new (thd->mem_root) Sensitive_cursor(thd, result)))
{
delete result_materialize;
+ result_materialize= NULL;
return 1;
}
@@ -212,6 +213,7 @@ int mysql_open_cursor(THD *thd, uint fla
if ((rc= materialized_cursor->open(0)))
{
delete materialized_cursor;
+ materialized_cursor= NULL;
goto err_open;
}
=== modified file 'tests/mysql_client_test.c'
--- a/tests/mysql_client_test.c 2008-08-11 13:45:45 +0000
+++ b/tests/mysql_client_test.c 2008-08-18 18:12:46 +0000
@@ -17623,7 +17623,6 @@ static void test_wl4166_2()
}
-
/**
Test how warnings generated during assignment of parameters
are (currently not) preserve in case of reprepare.
@@ -17881,6 +17880,36 @@ static void test_wl4284_1()
DBUG_VOID_RETURN;
}
+/**
+ Bug#38486 Crash when using cursor protocol
+*/
+
+static void test_bug38486(void)
+{
+ MYSQL_STMT *stmt;
+ const char *stmt_text;
+ unsigned long type= CURSOR_TYPE_READ_ONLY;
+
+ DBUG_ENTER("test_bug38486");
+ myheader("test_bug38486");
+
+ stmt= mysql_stmt_init(mysql);
+ mysql_stmt_attr_set(stmt, STMT_ATTR_CURSOR_TYPE, (void*)&type);
+ stmt_text= "CREATE TABLE t1 (a INT)";
+ mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text));
+ mysql_stmt_execute(stmt);
+ mysql_stmt_close(stmt);
+
+ stmt= mysql_stmt_init(mysql);
+ mysql_stmt_attr_set(stmt, STMT_ATTR_CURSOR_TYPE, (void*)&type);
+ stmt_text= "INSERT INTO t1 VALUES (1)";
+ mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text));
+ mysql_stmt_execute(stmt);
+ mysql_stmt_close(stmt);
+
+ DBUG_VOID_RETURN;
+}
+
/*
Read and parse arguments and MySQL options from my.cnf
*/
@@ -18193,6 +18222,7 @@ static struct my_tests_st my_tests[]= {
{ "test_wl4166_4", test_wl4166_4 },
{ "test_bug36004", test_bug36004 },
{ "test_wl4284_1", test_wl4284_1 },
+ { "test_bug38486", test_bug38486 },
{ 0, 0 }
};
| Thread | ||
|---|---|---|
| • bzr push into mysql-6.0-sea branch (v.narayanan:2693 to 2773) Bug#16902,Bug#28309, Bug#34286, Bug#36403, Bug#36468, Bug#36700, Bug#36745, Bug#36825,Bu... | Narayanan V | 20 Aug |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 1.327 sec. using MySQL 5.1.14-beta-log