2847 He Zhenxing 2009-04-21 [merge]
Auto merge
M mysql-test/include/setup_fake_relay_log.inc
M mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test
M mysql-test/suite/rpl/r/rpl_change_master.result
M mysql-test/suite/rpl/t/rpl_change_master.test
M sql/sql_repl.cc
2844.2.1 He Zhenxing 2009-04-21
BUG#12190 CHANGE MASTER has differ path requiremts on MASTER_LOG_FILE and RELAY_LOG_FILE
CHANGE MASTER TO command required the value for RELAY_LOG_FILE to
be an absolute path, which was different from the requirement of
MASTER_LOG_FILE.
This patch fixed the problem by changing the value for RELAY_LOG_FILE
to be the basename of the log file as that for MASTER_LOG_FILE.
M mysql-test/include/setup_fake_relay_log.inc
M mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test
M mysql-test/suite/rpl/r/rpl_change_master.result
M mysql-test/suite/rpl/t/rpl_change_master.test
M sql/sql_repl.cc
2846 He Zhenxing 2009-04-21 [merge]
Auto merge
M extra/my_print_defaults.c
M include/my_sys.h
M mysys/default.c
M mysys/my_getopt.c
M sql-common/client.c
M storage/ndb/test/run-test/setup.cpp
2844.1.1 He Zhenxing 2009-04-21
BUG#25192 Using relay-log and relay-log-index without values produces unexpected results.
Options loaded from config files were added before command line
arguments, and they were parsed together, which could interprete
the following:
option-a
option-b
as --option-a=--option-b if 'option-a' requires a value, and
caused confusing.
Because all options that requires a value are always given in
the form '--option=value', so it's an error if there is no
'=value' part for such an option read from config file.
This patch added a separator to separate the arguments from
config files and that from command line, so that they can be
handled differently. And report an error for options loaded
from config files that requires a value and is not given in the
form '--option=value'.
M extra/my_print_defaults.c
M include/my_sys.h
M mysys/default.c
M mysys/my_getopt.c
M sql-common/client.c
M storage/ndb/test/run-test/setup.cpp
2845 He Zhenxing 2009-04-21
BUG#38468 Memory leak detected when using mysqlbinlog utility
There were two memory leaks in mysqlbinlog command, one was already
fixed by previous patches, another one was that defaults_argv was
set to the value of argv after parse_args, in which called
handle_options after calling load_defaults and changed the value
of argv, and caused the memory allocated for defaults arguments
not freed.
Fixed the problem by setting defaults_argv right after calling
load_defaults.
@ client/mysqlbinlog.cc
Move load_defaults out of parse_args to main, set defaults_argv right after load_defaults
M client/mysqlbinlog.cc
M mysql-test/t/mysqlbinlog.test
2844 Alfranio Correia 2009-04-20 [merge]
merge 6.0-main --> 6.0-rpl
Conflicts:
.bzr-mysql/default.conf
A mysql-test/suite/falcon/r/falcon_bug_41890.result
A mysql-test/suite/falcon/t/falcon_bug_41890.test
M mysql-test/r/join_cache.result
M mysql-test/r/join_outer.result
M mysql-test/r/join_outer_jcl6.result
M mysql-test/r/select_jcl6.result
M mysql-test/r/subselect_sj2.result
M mysql-test/r/subselect_sj2_jcl6.result
M mysql-test/t/join_cache.test
M mysql-test/t/join_outer.test
M mysql-test/t/subselect_sj2.test
M sql/sql_join_cache.cc
M sql/sql_select.cc
M sql/sql_select.h
2599.389.15 Sergey Petrunia 2009-04-18
Better comments
@ sql/sql_select.h
Better comments
M sql/sql_select.h
2599.389.14 Sergey Petrunia 2009-04-16 [merge]
Merge mysql-6.0 -> mysql-6.0-opt
D mysql-test/suite/falcon/r/falcon_bug_22178.result
D mysql-test/suite/falcon/t/falcon_bug_22178.test
A mysql-test/collections/falcon_team.experimental
A mysql-test/collections/mysql-6.0-falcon-.push
A mysql-test/suite/falcon/r/falcon_bug_42208.result
A mysql-test/suite/falcon/r/falcon_bug_42405.result
A mysql-test/suite/falcon/r/falcon_index_v2.result
A mysql-test/suite/falcon/t/falcon_bug_42208.test
A mysql-test/suite/falcon/t/falcon_bug_42405.test
A mysql-test/suite/falcon/t/falcon_index_v2.test
A sql/rpl_info.cc
A sql/rpl_info.h
A sql/rpl_mi_file.cc
A sql/rpl_mi_file.h
A sql/rpl_rli_file.cc
A sql/rpl_rli_file.h
M .bzr-mysql/default.conf
M mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
M mysql-test/extra/rpl_tests/rpl_row_tabledefs.test
M mysql-test/lib/My/CoreDump.pm
M mysql-test/mysql-test-run.pl
M mysql-test/r/mysqldump.result
M mysql-test/suite/falcon/r/falcon_bug_22939.result
M mysql-test/suite/falcon/r/falcon_bug_22972.result
M mysql-test/suite/falcon/r/falcon_bug_24024.result
M mysql-test/suite/falcon/r/falcon_bug_26827.result
M mysql-test/suite/falcon/r/falcon_bug_26828.result
M mysql-test/suite/falcon/r/falcon_bug_28042.result
M mysql-test/suite/falcon/r/falcon_bug_29332.result
M mysql-test/suite/falcon/r/falcon_bug_30826.result
M mysql-test/suite/falcon/r/falcon_bug_32833.result
M mysql-test/suite/falcon/r/falcon_bug_33404.result
M mysql-test/suite/falcon/r/falcon_bugs.result
M mysql-test/suite/falcon/t/disabled.def
M mysql-test/suite/falcon/t/falcon_bug_22845.test
M mysql-test/suite/falcon/t/falcon_bug_22939.test
M mysql-test/suite/falcon/t/falcon_bug_22972.test
M mysql-test/suite/falcon/t/falcon_bug_24024.test
M mysql-test/suite/falcon/t/falcon_bug_26827.test
M mysql-test/suite/falcon/t/falcon_bug_26828.test
M mysql-test/suite/falcon/t/falcon_bug_28026.test
M mysql-test/suite/falcon/t/falcon_bug_28042.test
M mysql-test/suite/falcon/t/falcon_bug_29332.test
M mysql-test/suite/falcon/t/falcon_bug_30826.test
M mysql-test/suite/falcon/t/falcon_bug_30878.test
M mysql-test/suite/falcon/t/falcon_bug_32833.test
M mysql-test/suite/falcon/t/falcon_bug_33404.test
M mysql-test/suite/falcon/t/falcon_bugs.test
M mysql-test/suite/falcon_team/t/test2bug.def
M mysql-test/suite/rpl/r/rpl_extraCol_innodb.result
M mysql-test/suite/rpl/r/rpl_extraCol_myisam.result
M mysql-test/suite/rpl/r/rpl_heartbeat_2slaves.result
M mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result
M mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result
M mysql-test/suite/rpl/t/disabled.def
M mysql-test/suite/rpl/t/rpl_heartbeat_2slaves.cnf
M mysql-test/suite/rpl/t/rpl_heartbeat_2slaves.test
M sql/CMakeLists.txt
M sql/Makefile.am
M sql/ha_ndbcluster.cc
M sql/item_func.cc
M sql/log.cc
M sql/log_event.cc
M sql/log_event_old.cc
M sql/mysqld.cc
M sql/rpl_mi.cc
M sql/rpl_mi.h
M sql/rpl_record.cc
M sql/rpl_record.h
M sql/rpl_reporting.cc
M sql/rpl_reporting.h
M sql/rpl_rli.cc
M sql/rpl_rli.h
M sql/set_var.cc
M sql/slave.cc
M sql/slave.h
M sql/sp_head.cc
M sql/sql_acl.cc
M sql/sql_acl.h
M sql/sql_binlog.cc
M sql/sql_insert.cc
M sql/sql_load.cc
M sql/sql_parse.cc
M sql/sql_repl.cc
M storage/falcon/Cache.cpp
M storage/falcon/CycleManager.cpp
M storage/falcon/CycleManager.h
M storage/falcon/Database.cpp
M storage/falcon/Database.h
M storage/falcon/Dbb.cpp
M storage/falcon/Dbb.h
M storage/falcon/DeferredIndex.cpp
M storage/falcon/ErrorInjector.cpp
M storage/falcon/ErrorInjector.h
M storage/falcon/IO.cpp
M storage/falcon/Index.cpp
M storage/falcon/Index.h
M storage/falcon/Index2RootPage.cpp
M storage/falcon/IndexPage.cpp
M storage/falcon/IndexPage.h
M storage/falcon/IndexRootPage.cpp
M storage/falcon/Inversion.cpp
M storage/falcon/Inversion.h
M storage/falcon/Record.cpp
M storage/falcon/Record.h
M storage/falcon/RecordLeaf.cpp
M storage/falcon/RecordLocatorPage.cpp
M storage/falcon/RecordLocatorPage.h
M storage/falcon/RecordScavenge.cpp
M storage/falcon/RecordVersion.cpp
M storage/falcon/RecordVersion.h
M storage/falcon/RepositoryVolume.cpp
M storage/falcon/SRLCreateIndex.cpp
M storage/falcon/SRLDeleteIndex.cpp
M storage/falcon/SRLIndexPage.cpp
M storage/falcon/SRLUpdateIndex.cpp
M storage/falcon/SRLUpdateRecords.cpp
M storage/falcon/Section.cpp
M storage/falcon/SerialLog.cpp
M storage/falcon/SerialLog.h
M storage/falcon/Statement.cpp
M storage/falcon/StorageDatabase.cpp
M storage/falcon/StorageVersion.h
M storage/falcon/Table.cpp
M storage/falcon/Table.h
M storage/falcon/TableSpace.cpp
M storage/falcon/Transaction.cpp
M storage/falcon/Transaction.h
2599.389.13 Igor Babaev 2009-04-15
Fixed bug #44250.
When the BKA algorithm is used for a join operation the records
from the employed join buffer are uploaded into the join records
buffers in order the pushdown condition to be checked. In a general
case the records are uploaded not in the same order as they have
been written into the join buffer. As a consequence when all
matches for the records in the join buffer have been found the
record buffers only incidentally may contain the fields of the last
record put into the join buffer. This breaks the proper flow of
the BKA algorithm in the cases when incremental join buffers are
employed. To fix this problem the values of the the fields of the
last record written into the buffer are restored in record buffer
just before the join buffer is reset for the next portion of records.
These fields were restored in the previous code, but erroneously
the restoration happened in the JOIN_CACHE::join_records method
during the invocation of the function join_matching_records.
The fact is the succeeded call of next_cache->join_records may
overwrite that last record fields. This may lead to wrong result
sets or even memory corruption if blob values are written into
the join buffer. The test case reported in the bug demonstrated
such a corruption.
The submitted fix moved the restoration of the fields of the last
record into the code of JOIN_CACHE::join_records. This restoration
is performed before the join buffer is reset for writing or reading.
A reset for reading is needed when an outer join operation is executed.
@ mysql-test/r/join_cache.result
Added a test case for bug #44250.
@ mysql-test/t/join_cache.test
Added a test case for bug #44250.
@ sql/sql_join_cache.cc
Fixed bug #44250.
Added a default implementation of the virtual method restore_last_record
to restore the fields of the last record from the join buffer in record
buffers. Called this restoration function in JOIN_CACHE::join_records.
Removed restoration of the fields of the last record from other functions.
@ sql/sql_select.h
Fixed bug #44250.
In JOIN_CACHE: added a virtual method to restore the fields of the last
record from the join buffer in record buffers.
M mysql-test/r/join_cache.result
M mysql-test/t/join_cache.test
M sql/sql_join_cache.cc
M sql/sql_select.h
2599.389.12 Sergey Petrunia 2009-04-13 [merge]
mysql-6.0-opt -> mysql-6.0
D mysql-test/suite/sys_vars/r/event_scheduler_func.result
D mysql-test/suite/sys_vars/t/event_scheduler_func.test
D mysql-test/t/system_mysql_db_fix30020.test
D scripts/mysql_fix_privilege_tables.sh
A mysql-test/extra/binlog_tests/drop_table.test
A mysql-test/extra/rpl_tests/rpl_loadfile.test
A mysql-test/include/UnicodeData.txt
A mysql-test/include/bug38347.inc
A mysql-test/r/lock_multi_bug38499.result
A mysql-test/r/lock_multi_bug38691.result
A mysql-test/r/mysql-bug41486.result
A mysql-test/suite/binlog/r/binlog_row_drop_tbl.result
A mysql-test/suite/binlog/r/binlog_stm_drop_tbl.result
A mysql-test/suite/binlog/t/binlog_row_drop_tbl.test
A mysql-test/suite/binlog/t/binlog_stm_drop_tbl.test
A mysql-test/suite/falcon/r/falcon_bug_40950.result
A mysql-test/suite/falcon/r/falcon_bug_43452.result
A mysql-test/suite/falcon/t/falcon_bug_40950.test
A mysql-test/suite/falcon/t/falcon_bug_43452.test
A mysql-test/suite/maria/r/maria4.result
A mysql-test/suite/maria/t/maria-autozerofill-master.opt
A mysql-test/suite/maria/t/maria-no-logging-master.opt
A mysql-test/suite/maria/t/maria4.test
A mysql-test/suite/rpl/r/rpl_row_wide_table.result
A mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
A mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result
A mysql-test/suite/rpl/r/rpl_stm_loadfile.result
A mysql-test/suite/rpl/t/rpl_row_wide_table.test
A mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile-slave.opt
A mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
A mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist-slave.opt
A mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test
A mysql-test/suite/rpl/t/rpl_stm_loadfile.test
A mysql-test/t/lock_multi_bug38499.test
A mysql-test/t/lock_multi_bug38691.test
A mysql-test/t/mysql-bug41486.test
A storage/falcon/CycleLock.cpp
A storage/falcon/CycleLock.h
A storage/falcon/CycleManager.cpp
A storage/falcon/CycleManager.h
A storage/falcon/ErrorInjector.cpp
A storage/falcon/ErrorInjector.h
A storage/falcon/TransactionState.cpp
A storage/falcon/TransactionState.h
R mysql-test/suite/falcon_team/r/falcon_bug_36294-big.result => mysql-test/suite/falcon/r/falcon_bug_36294-big.result
R mysql-test/suite/falcon_team/t/falcon_bug_36294-big.test => mysql-test/suite/falcon/t/falcon_bug_36294-big.test
M client/my_readline.h
M client/mysql.cc
M client/mysqldump.c
M client/mysqltest.cc
M client/readline.cc
M dbug/dbug.c
M include/base64.h
M include/lf.h
M include/my_sys.h
M libmysqld/CMakeLists.txt
M libmysqld/examples/CMakeLists.txt
M mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
M mysql-test/include/concurrent.inc
M mysql-test/include/default_my.cnf
M mysql-test/include/have_blackhole.inc
M mysql-test/include/locktrans.inc
M mysql-test/include/mix1.inc
M mysql-test/include/mix2.inc
M mysql-test/lib/My/CoreDump.pm
M mysql-test/mysql-test-run.pl
M mysql-test/r/archive.result
M mysql-test/r/concurrent_innodb_safelog.result
M mysql-test/r/concurrent_innodb_unsafelog.result
M mysql-test/r/create.result
M mysql-test/r/ctype_collate.result
M mysql-test/r/ddl_i18n_koi8r.result
M mysql-test/r/ddl_i18n_utf8.result
M mysql-test/r/events_1.result
M mysql-test/r/events_2.result
M mysql-test/r/explain.result
M mysql-test/r/flush_block_commit.result
M mysql-test/r/flush_block_commit_notembedded.result
M mysql-test/r/grant.result
M mysql-test/r/index_merge_myisam.result
M mysql-test/r/information_schema.result
M mysql-test/r/innodb.result
M mysql-test/r/innodb_mysql.result
M mysql-test/r/lock.result
M mysql-test/r/lock_multi.result
M mysql-test/r/locktrans_innodb.result
M mysql-test/r/locktrans_myisam.result
M mysql-test/r/mix2_myisam.result
M mysql-test/r/myisampack.result
M mysql-test/r/mysqlbinlog.result
M mysql-test/r/mysqldump.result
M mysql-test/r/not_embedded_server.result
M mysql-test/r/partition_innodb_semi_consistent.result
M mysql-test/r/ps.result
M mysql-test/r/read_only_innodb.result
M mysql-test/r/select.result
M mysql-test/r/select_jcl6.result
M mysql-test/r/show_check.result
M mysql-test/r/subselect3.result
M mysql-test/r/subselect3_jcl6.result
M mysql-test/r/subselect_mat.result
M mysql-test/r/subselect_no_mat.result
M mysql-test/r/subselect_no_opts.result
M mysql-test/r/subselect_no_semijoin.result
M mysql-test/r/subselect_sj.result
M mysql-test/r/subselect_sj_jcl6.result
M mysql-test/r/type_datetime.result
M mysql-test/r/variables_debug.result
M mysql-test/suite/backup/include/backup_client_regex_output.inc
M mysql-test/suite/backup/r/backup_client.result
M mysql-test/suite/backup/r/backup_client_binlog.result
M mysql-test/suite/backup/r/backup_objects_dependency.result
M mysql-test/suite/backup/t/backup_maria_other_instance.test
M mysql-test/suite/backup/t/disabled.def
M mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
M mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
M mysql-test/suite/falcon/r/falcon_bugs2.result
M mysql-test/suite/falcon/r/falcon_options.result
M mysql-test/suite/falcon/r/falcon_options2.result
M mysql-test/suite/falcon/r/falcon_unicode-big.result
M mysql-test/suite/falcon/t/disabled.def
M mysql-test/suite/falcon/t/falcon_bugs2.test
M mysql-test/suite/falcon/t/falcon_unicode-big.test
M mysql-test/suite/falcon_team/r/falcon_deadlock.result
M mysql-test/suite/falcon_team/t/falcon_bug_34174.test
M mysql-test/suite/falcon_team/t/falcon_deadlock.test
M mysql-test/suite/falcon_team/t/test2bug.def
M mysql-test/suite/federated/federated.result
M mysql-test/suite/federated/federated.test
M mysql-test/suite/funcs_1/r/is_columns_is.result
M mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
M mysql-test/suite/funcs_1/r/processlist_priv_ps.result
M mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
M mysql-test/suite/funcs_1/r/processlist_val_ps.result
M mysql-test/suite/maria/r/maria-recovery-bitmap.result
M mysql-test/suite/maria/r/maria-recovery2.result
M mysql-test/suite/maria/r/maria.result
M mysql-test/suite/maria/t/disabled.def
M mysql-test/suite/maria/t/maria-recovery-bitmap.test
M mysql-test/suite/maria/t/maria-recovery2.test
M mysql-test/suite/ndb/r/ndb_index_ordered.result
M mysql-test/suite/ndb/t/disabled.def
M mysql-test/suite/ndb/t/ndb_index_ordered.test
M mysql-test/suite/parts/r/partition_special_innodb.result
M mysql-test/suite/parts/t/partition_special_innodb.test
M mysql-test/suite/rpl/r/rpl_do_grant.result
M mysql-test/suite/rpl/r/rpl_loaddatalocal.result
M mysql-test/suite/rpl/r/rpl_loadfile.result
M mysql-test/suite/rpl/r/rpl_locktrans_falcon.result
M mysql-test/suite/rpl/r/rpl_locktrans_innodb.result
M mysql-test/suite/rpl/r/rpl_locktrans_myisam.result
M mysql-test/suite/rpl/r/rpl_rotate_logs.result
M mysql-test/suite/rpl/r/rpl_slave_load_in.result
M mysql-test/suite/rpl/r/rpl_stm_log.result
M mysql-test/suite/rpl/r/rpl_temporary.result
M mysql-test/suite/rpl/r/rpl_timezone.result
M mysql-test/suite/rpl/t/disabled.def
M mysql-test/suite/rpl/t/rpl_do_grant.test
M mysql-test/suite/rpl/t/rpl_loaddatalocal.test
M mysql-test/suite/rpl/t/rpl_loadfile.test
M mysql-test/suite/rpl/t/rpl_rotate_logs.test
M mysql-test/suite/rpl/t/rpl_slave_load_in.test
M mysql-test/suite/rpl/t/rpl_temporary.test
M mysql-test/suite/rpl/t/rpl_timezone.test
M mysql-test/suite/sys_vars/inc/slave_transaction_retries_basic.inc
M mysql-test/suite/sys_vars/inc/sync_binlog_basic.inc
M mysql-test/suite/sys_vars/r/binlog_cache_size_basic_32.result
M mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_32.result
M mysql-test/suite/sys_vars/r/delay_key_write_basic.result
M mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_32.result
M mysql-test/suite/sys_vars/r/delayed_insert_limit_func.result
M mysql-test/suite/sys_vars/r/delayed_queue_size_basic_32.result
M mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result
M mysql-test/suite/sys_vars/r/foreign_key_checks_basic.result
M mysql-test/suite/sys_vars/r/interactive_timeout_func.result
M mysql-test/suite/sys_vars/r/join_buffer_size_basic_32.result
M mysql-test/suite/sys_vars/r/keep_files_on_create_basic.result
M mysql-test/suite/sys_vars/r/key_buffer_size_basic_32.result
M mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_32.result
M mysql-test/suite/sys_vars/r/key_cache_block_size_basic_32.result
M mysql-test/suite/sys_vars/r/key_cache_division_limit_basic_32.result
M mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_basic.result
M mysql-test/suite/sys_vars/r/log_warnings_basic_32.result
M mysql-test/suite/sys_vars/r/low_priority_updates_basic.result
M mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_32.result
M mysql-test/suite/sys_vars/r/max_connect_errors_basic_32.result
M mysql-test/suite/sys_vars/r/max_heap_table_size_basic_32.result
M mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_32.result
M mysql-test/suite/sys_vars/r/max_tmp_tables_basic_32.result
M mysql-test/suite/sys_vars/r/max_write_lock_count_basic_32.result
M mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_32.result
M mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_32.result
M mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_32.result
M mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_32.result
M mysql-test/suite/sys_vars/r/net_retry_count_basic_32.result
M mysql-test/suite/sys_vars/r/new_basic.result
M mysql-test/suite/sys_vars/r/old_passwords_basic.result
M mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result
M mysql-test/suite/sys_vars/r/query_cache_limit_basic_32.result
M mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_32.result
M mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result
M mysql-test/suite/sys_vars/r/query_cache_type_basic.result
M mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_basic.result
M mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_func.result
M mysql-test/suite/sys_vars/r/query_prealloc_size_basic_32.result
M mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_32.result
M mysql-test/suite/sys_vars/r/read_buffer_size_basic.result
M mysql-test/suite/sys_vars/r/rpl_init_slave_func.result
M mysql-test/suite/sys_vars/r/rpl_max_binlog_size_func.result
M mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_32.result
M mysql-test/suite/sys_vars/r/rpl_slave_net_timeout_basic.result
M mysql-test/suite/sys_vars/r/server_id_basic_32.result
M mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_32.result
M mysql-test/suite/sys_vars/r/slow_query_log_func.result
M mysql-test/suite/sys_vars/r/sql_big_selects_basic.result
M mysql-test/suite/sys_vars/r/sql_big_tables_basic.result
M mysql-test/suite/sys_vars/r/sql_buffer_result_basic.result
M mysql-test/suite/sys_vars/r/sql_log_bin_basic.result
M mysql-test/suite/sys_vars/r/sql_log_off_basic.result
M mysql-test/suite/sys_vars/r/sql_low_priority_updates_basic.result
M mysql-test/suite/sys_vars/r/sql_low_priority_updates_func.result
M mysql-test/suite/sys_vars/r/sql_notes_basic.result
M mysql-test/suite/sys_vars/r/sql_quote_show_create_basic.result
M mysql-test/suite/sys_vars/r/sql_safe_updates_basic.result
M mysql-test/suite/sys_vars/r/sql_warnings_basic.result
M mysql-test/suite/sys_vars/r/sync_binlog_basic_32.result
M mysql-test/suite/sys_vars/r/tmp_table_size_basic.result
M mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result
M mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_32.result
M mysql-test/suite/sys_vars/r/tx_isolation_basic.result
M mysql-test/suite/sys_vars/r/wait_timeout_basic_32.result
M mysql-test/suite/sys_vars/t/autocommit_func.test
M mysql-test/suite/sys_vars/t/concurrent_insert_func.test
M mysql-test/suite/sys_vars/t/delay_key_write_basic.test
M mysql-test/suite/sys_vars/t/delayed_insert_limit_func.test
M mysql-test/suite/sys_vars/t/engine_condition_pushdown_basic.test
M mysql-test/suite/sys_vars/t/foreign_key_checks_basic.test
M mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_func.test
M mysql-test/suite/sys_vars/t/interactive_timeout_func.test
M mysql-test/suite/sys_vars/t/keep_files_on_create_basic.test
M mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_basic.test
M mysql-test/suite/sys_vars/t/low_priority_updates_basic.test
M mysql-test/suite/sys_vars/t/new_basic.test
M mysql-test/suite/sys_vars/t/old_passwords_basic.test
M mysql-test/suite/sys_vars/t/query_cache_type_basic.test
M mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_basic.test
M mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_func.test
M mysql-test/suite/sys_vars/t/rpl_init_slave_func.test
M mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func.test
M mysql-test/suite/sys_vars/t/slow_query_log_func.test
M mysql-test/suite/sys_vars/t/sql_big_selects_basic.test
M mysql-test/suite/sys_vars/t/sql_big_tables_basic.test
M mysql-test/suite/sys_vars/t/sql_buffer_result_basic.test
M mysql-test/suite/sys_vars/t/sql_log_bin_basic.test
M mysql-test/suite/sys_vars/t/sql_log_off_basic.test
M mysql-test/suite/sys_vars/t/sql_low_priority_updates_basic.test
M mysql-test/suite/sys_vars/t/sql_low_priority_updates_func.test
M mysql-test/suite/sys_vars/t/sql_notes_basic.test
M mysql-test/suite/sys_vars/t/sql_quote_show_create_basic.test
M mysql-test/suite/sys_vars/t/sql_safe_updates_basic.test
M mysql-test/suite/sys_vars/t/sql_warnings_basic.test
M mysql-test/suite/sys_vars/t/timestamp_func.test
M mysql-test/suite/sys_vars/t/tx_isolation_basic.test
M mysql-test/suite/sys_vars/t/wait_timeout_func.test
M mysql-test/t/archive.test
M mysql-test/t/ctype_collate.test
M mysql-test/t/disabled.def
M mysql-test/t/explain.test
M mysql-test/t/flush_block_commit.test
M mysql-test/t/flush_block_commit_notembedded.test
M mysql-test/t/grant.test
M mysql-test/t/index_merge_myisam.test
M mysql-test/t/information_schema.test
M mysql-test/t/innodb.test
M mysql-test/t/lock.test
M mysql-test/t/lock_multi.test
M mysql-test/t/myisampack.test
M mysql-test/t/not_embedded_server.test
M mysql-test/t/partition_innodb_semi_consistent.test
M mysql-test/t/ps.test
M mysql-test/t/read_only_innodb.test
M mysql-test/t/select.test
M mysql-test/t/subselect3.test
M mysql-test/t/subselect_mat.test
M mysql-test/t/subselect_no_mat.test
M mysql-test/t/subselect_no_opts.test
M mysql-test/t/subselect_no_semijoin.test
M mysql-test/t/subselect_sj.test
M mysql-test/t/type_datetime.test
M mysql-test/t/user_limits.test
M mysql-test/t/variables_debug.test
M mysql-test/t/xa.test
M mysys/base64.c
M mysys/default.c
M mysys/hash.c
M mysys/lf_alloc-pin.c
M mysys/my_error.c
M mysys/my_new.cc
M mysys/my_static.c
M mysys/my_winfile.c
M mysys/tests/testhash.c
M mysys/thr_lock.c
M scripts/Makefile.am
M scripts/mysql_system_tables_fix.sql
M scripts/mysqld_safe.sh
M sql/debug_sync.cc
M sql/event_data_objects.cc
M sql/handler.cc
M sql/item.cc
M sql/item_create.cc
M sql/log.cc
M sql/log_event.cc
M sql/mdl.cc
M sql/mysql_priv.h
M sql/mysqld.cc
M sql/opt_range.cc
M sql/rpl_injector.cc
M sql/rpl_rli.cc
M sql/scheduler.cc
M sql/set_var.cc
M sql/set_var.h
M sql/slave.cc
M sql/sql_acl.cc
M sql/sql_acl.h
M sql/sql_base.cc
M sql/sql_binlog.cc
M sql/sql_cache.cc
M sql/sql_class.cc
M sql/sql_class.h
M sql/sql_insert.cc
M sql/sql_parse.cc
M sql/sql_prepare.cc
M sql/sql_select.cc
M sql/sql_select.h
M sql/sql_servers.cc
M sql/sql_show.cc
M sql/sql_table.cc
M sql/sql_view.cc
M sql/strfunc.cc
M sql/table.cc
M sql/table.h
M sql/transaction.cc
M sql/tztime.cc
M sql/udf_example.c
M storage/archive/ha_archive.cc
M storage/csv/ha_tina.cc
M storage/csv/ha_tina.h
M storage/csv/transparent_file.cc
M storage/csv/transparent_file.h
M storage/falcon/BDB.cpp
M storage/falcon/BDB.h
M storage/falcon/BackLog.cpp
M storage/falcon/BigInt.cpp
M storage/falcon/BigInt.h
M storage/falcon/CMakeLists.txt
M storage/falcon/Cache.cpp
M storage/falcon/Cache.h
M storage/falcon/CmdGen.cpp
M storage/falcon/Configuration.cpp
M storage/falcon/Connection.cpp
M storage/falcon/Context.cpp
M storage/falcon/Database.cpp
M storage/falcon/Database.h
M storage/falcon/Dbb.cpp
M storage/falcon/Dbb.h
M storage/falcon/Debug.cpp
M storage/falcon/EncodedRecord.cpp
M storage/falcon/FsbSort.cpp
M storage/falcon/IO.cpp
M storage/falcon/ImageManager.cpp
M storage/falcon/Index.cpp
M storage/falcon/Index.h
M storage/falcon/Index2Page.cpp
M storage/falcon/IndexPage.cpp
M storage/falcon/IndexPage.h
M storage/falcon/IndexRootPage.cpp
M storage/falcon/IndexRootPage.h
M storage/falcon/IndexWalker.cpp
M storage/falcon/JString.cpp
M storage/falcon/JString.h
M storage/falcon/Makefile.am
M storage/falcon/MemControl.cpp
M storage/falcon/MemControl.h
M storage/falcon/MemMgr.cpp
M storage/falcon/MemMgr.h
M storage/falcon/MemoryManager.h
M storage/falcon/PageInventoryPage.cpp
M storage/falcon/Record.cpp
M storage/falcon/Record.h
M storage/falcon/RecordLeaf.cpp
M storage/falcon/RecordLocatorPage.cpp
M storage/falcon/RecordScavenge.cpp
M storage/falcon/RecordVersion.cpp
M storage/falcon/RecordVersion.h
M storage/falcon/Repository.cpp
M storage/falcon/Repository.h
M storage/falcon/RepositoryVolume.cpp
M storage/falcon/RepositoryVolume.h
M storage/falcon/SQLError.cpp
M storage/falcon/SQLError.h
M storage/falcon/SRLIndexPage.cpp
M storage/falcon/SRLIndexPage.h
M storage/falcon/SRLUpdateRecords.cpp
M storage/falcon/SRLVersion.h
M storage/falcon/SavePoint.cpp
M storage/falcon/Scavenger.cpp
M storage/falcon/Schedule.cpp
M storage/falcon/Section.cpp
M storage/falcon/SerialLog.cpp
M storage/falcon/SerialLogRecord.h
M storage/falcon/SortRecord.cpp
M storage/falcon/Statement.cpp
M storage/falcon/StorageDatabase.cpp
M storage/falcon/StorageHandler.cpp
M storage/falcon/StorageTable.cpp
M storage/falcon/StorageTable.h
M storage/falcon/StorageTableShare.h
M storage/falcon/StorageVersion.h
M storage/falcon/SyncObject.cpp
M storage/falcon/Table.cpp
M storage/falcon/Table.h
M storage/falcon/TableSpaceManager.cpp
M storage/falcon/Thread.cpp
M storage/falcon/Thread.h
M storage/falcon/Transaction.cpp
M storage/falcon/Transaction.h
M storage/falcon/TransactionManager.cpp
M storage/falcon/Value.cpp
M storage/falcon/WalkIndex.cpp
M storage/falcon/ha_falcon.cpp
M storage/maria/ha_maria.cc
M storage/maria/ma_examine_non_trans_log.c
M storage/maria/ma_key.c
M storage/maria/ma_locking.c
M storage/maria/ma_loghandler.c
M storage/maria/ma_non_trans_log.c
M storage/maria/ma_recovery.c
M storage/maria/ma_rkey.c
M storage/maria/ma_test_force_start.pl
M storage/maria/maria_chk.c
M storage/maria/maria_non_trans_log.c
M storage/maria/trnman.c
M storage/myisam/mi_packrec.c
M storage/ndb/src/mgmapi/mgmapi.cpp
M storage/ndb/src/mgmsrv/Services.cpp
M strings/Makefile.am
M unittest/mysys/CMakeLists.txt
M unittest/mysys/base64-t.c
M unittest/mysys/waiting_threads-t.c
2599.389.11 Igor Babaev 2009-04-11 [merge]
Automerge
M sql/sql_select.cc
2599.481.1 Sergey Petrunia 2009-04-11
BUG#42740: Pushbuild fixes
@ sql/sql_select.cc
BUG#42740: Pushbuild fixes
M sql/sql_select.cc
2599.389.10 Igor Babaev 2009-04-03
Fixed bug #44019.
This bug happened when incremental (linked) join buffers were
employed to join several tables.
If some fields stored in one of such incremental join buffers
are used to build keys to access tables that follow the next
joined table, then offsets of these fields are saved at the
very end of the records stored in the join buffer.
These offsets allow us to read only those record fields that
are needed for building key values.
Each field whose offset is saved gets its own unique number
that determines the position of the offset for the field in
the sequence of field offsets stored for a record.
In a general case the order of the offsets in the sequence
does not comply with the order of the corresponding fields.
This fact was ignored by the code of the function
JOIN_CACHE:: write_record_data.
@ mysql-test/r/join_cache.result
Added a test case for bug #44019.
@ mysql-test/t/join_cache.test
Added a test case for bug #44019.
@ sql/sql_join_cache.cc
Fixed bug #44019.
Modified the function JOIN_CACHE:: write_record_data to
make it write optional field offsets in the same order
in which they are read from the join buffer.
M mysql-test/r/join_cache.result
M mysql-test/t/join_cache.test
M sql/sql_join_cache.cc
2599.389.9 Igor Babaev 2009-04-02
Corrections after the fix for bug 42740.
@ mysql-test/r/subselect_sj2_jcl6.result
Added results for the test case introduced in the fix.
@ sql/sql_select.cc
Corrected an assertion in the fix.
M mysql-test/r/subselect_sj2_jcl6.result
M sql/sql_select.cc
2599.389.8 Sergey Petrunia 2009-03-26 [merge]
Merge
D mysql-test/suite/backup/r/backup_view_on_view.result
D mysql-test/suite/backup/t/backup_view_on_view.test
D mysql-test/suite/backup_engines/r/backup_procedures.result
D mysql-test/suite/backup_engines/r/backup_ptr_commit_mixed.result
D mysql-test/suite/backup_engines/r/backup_ptr_commit_stmt.result
D mysql-test/suite/backup_engines/r/backup_ptr_mixed.result
D mysql-test/suite/backup_engines/r/backup_ptr_objects_mixed.result
D mysql-test/suite/backup_engines/r/backup_ptr_objects_row.result
D mysql-test/suite/backup_engines/r/backup_ptr_objects_stmt.result
D mysql-test/suite/backup_engines/r/backup_ptr_row.result
D mysql-test/suite/backup_engines/r/backup_ptr_stmt.result
D mysql-test/suite/backup_engines/t/backup_procedures.test
D mysql-test/suite/backup_engines/t/backup_ptr_commit_mixed.test
D mysql-test/suite/backup_engines/t/backup_ptr_commit_row.test
D mysql-test/suite/backup_engines/t/backup_ptr_commit_stmt.test
D mysql-test/suite/backup_engines/t/backup_ptr_mixed.test
D mysql-test/suite/backup_engines/t/backup_ptr_objects_mixed.test
D mysql-test/suite/backup_engines/t/backup_ptr_objects_row.test
D mysql-test/suite/backup_engines/t/backup_ptr_objects_stmt.test
D mysql-test/suite/backup_engines/t/backup_ptr_row.test
D mysql-test/suite/backup_engines/t/backup_ptr_stmt.test
D mysql-test/suite/backup_engines/t/disabled.def
A client/backup_stream.c
A client/backup_stream.h
A client/mysqlbackup.cc
A mysql-test/r/myisamlog_coverage.result
A mysql-test/suite/backup/README
A mysql-test/suite/backup/include/
A mysql-test/suite/backup/include/backup_client_regex_output.inc
A mysql-test/suite/backup/include/backup_client_regex_usage.inc
A mysql-test/suite/backup/include/bml_test.inc
A mysql-test/suite/backup/include/objects_dependency_use.inc
A mysql-test/suite/backup/r/backup_accented.result
A mysql-test/suite/backup/r/backup_client.result
A mysql-test/suite/backup/r/backup_client_binlog.result
A mysql-test/suite/backup/r/backup_client_coverage.result
A mysql-test/suite/backup/r/backup_compression_non_win.result
A mysql-test/suite/backup/r/backup_db_grants_extra.result
A mysql-test/suite/backup/r/backup_dbname_lctn0.result
A mysql-test/suite/backup/r/backup_dbname_lctn1.result
A mysql-test/suite/backup/r/backup_dbname_lctn2.result
A mysql-test/suite/backup/r/backup_errors_compression.result
A mysql-test/suite/backup/r/backup_image_name_notwin.result
A mysql-test/suite/backup/r/backup_image_name_win.result
A mysql-test/suite/backup/r/backup_mysql_upgrade.result
A mysql-test/suite/backup/r/backup_object_count.result
A mysql-test/suite/backup/r/backup_objects_dependency.result
A mysql-test/suite/backup/r/backup_pipe.result
A mysql-test/suite/backup/r/backup_special_characters.result
A mysql-test/suite/backup/r/backup_stream_pipe.result
A mysql-test/suite/backup/r/backup_table_grants.result
A mysql-test/suite/backup/t/backup_accented.test
A mysql-test/suite/backup/t/backup_client.test
A mysql-test/suite/backup/t/backup_client_binlog.test
A mysql-test/suite/backup/t/backup_client_coverage.test
A mysql-test/suite/backup/t/backup_compression_non_win.test
A mysql-test/suite/backup/t/backup_db_grants_extra.test
A mysql-test/suite/backup/t/backup_dbname_lctn0-master.opt
A mysql-test/suite/backup/t/backup_dbname_lctn0.test
A mysql-test/suite/backup/t/backup_dbname_lctn1-master.opt
A mysql-test/suite/backup/t/backup_dbname_lctn1.test
A mysql-test/suite/backup/t/backup_dbname_lctn2-master.opt
A mysql-test/suite/backup/t/backup_dbname_lctn2.test
A mysql-test/suite/backup/t/backup_errors_compression.test
A mysql-test/suite/backup/t/backup_image_name_notwin.test
A mysql-test/suite/backup/t/backup_image_name_win.test
A mysql-test/suite/backup/t/backup_mysql_upgrade.test
A mysql-test/suite/backup/t/backup_object_count.test
A mysql-test/suite/backup/t/backup_objects_dependency.test
A mysql-test/suite/backup/t/backup_pipe.test
A mysql-test/suite/backup/t/backup_special_characters.test
A mysql-test/suite/backup/t/backup_stream_pipe.test
A mysql-test/suite/backup/t/backup_table_grants.test
A mysql-test/suite/backup_engines/README
A mysql-test/suite/backup_engines/include/not_archive.inc
A mysql-test/suite/backup_engines/include/not_csv.inc
A mysql-test/suite/backup_ptr/
A mysql-test/suite/backup_ptr/README
A mysql-test/suite/backup_ptr/combinations
A mysql-test/suite/backup_ptr/include/
A mysql-test/suite/backup_ptr/r/
A mysql-test/suite/backup_ptr/r/backup_ptr.result
A mysql-test/suite/backup_ptr/r/backup_ptr_objects.result
A mysql-test/suite/backup_ptr/t/
A mysql-test/suite/rpl/r/rpl_empty_master_host.result
A mysql-test/suite/rpl/r/rpl_heartbeat_2slaves.result
A mysql-test/suite/rpl/r/rpl_heartbeat_basic.result
A mysql-test/suite/rpl/r/rpl_heartbeat_ssl.result
A mysql-test/suite/rpl/r/rpl_slow_query_log.result
A mysql-test/suite/rpl/r/rpl_sync.result
A mysql-test/suite/rpl/t/rpl_empty_master_host.test
A mysql-test/suite/rpl/t/rpl_heartbeat_2slaves.cnf
A mysql-test/suite/rpl/t/rpl_heartbeat_2slaves.test
A mysql-test/suite/rpl/t/rpl_heartbeat_basic.cnf
A mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
A mysql-test/suite/rpl/t/rpl_heartbeat_ssl.test
A mysql-test/suite/rpl/t/rpl_slow_query_log-slave.opt
A mysql-test/suite/rpl/t/rpl_slow_query_log.test
A mysql-test/suite/rpl/t/rpl_sync-slave.opt
A mysql-test/suite/rpl/t/rpl_sync.test
A mysql-test/t/myisamlog_coverage-master.opt
A mysql-test/t/myisamlog_coverage.test
R mysql-test/suite/backup/r/backup_ddl_blocker.result => mysql-test/suite/backup/r/backup_bml.result
R mysql-test/suite/backup/r/backup_securefilepriv.result => mysql-test/suite/backup/r/backup_securebackup.result
R mysql-test/suite/backup/t/backup_ddl_blocker.test => mysql-test/suite/backup/t/backup_bml.test
R mysql-test/suite/backup/t/backup_securefilepriv-master.opt => mysql-test/suite/backup/t/backup_securebackup-master.opt
R mysql-test/suite/backup/t/backup_securefilepriv.test => mysql-test/suite/backup/t/backup_securebackup.test
R mysql-test/suite/backup_engines/include/backup_ptr.inc => mysql-test/suite/backup_ptr/t/backup_ptr.test
R mysql-test/suite/backup_engines/include/backup_ptr_commit.inc => mysql-test/suite/backup_ptr/t/backup_ptr_commits.test
R mysql-test/suite/backup_engines/include/backup_ptr_objects.inc => mysql-test/suite/backup_ptr/t/backup_ptr_objects.test
R mysql-test/suite/backup_engines/include/not_have_falcon.inc => mysql-test/suite/backup_engines/include/not_falcon.inc
R mysql-test/suite/backup_engines/include/not_have_innodb.inc => mysql-test/suite/backup_engines/include/not_innodb.inc
R mysql-test/suite/backup_engines/include/not_have_memory.inc => mysql-test/suite/backup_engines/include/not_memory.inc
R mysql-test/suite/backup_engines/include/not_have_myisam.inc => mysql-test/suite/backup_engines/include/not_myisam.inc
R mysql-test/suite/backup_engines/r/backup_functions.result => mysql-test/suite/backup/r/backup_functions.result
R mysql-test/suite/backup_engines/r/backup_online_testing.result => mysql-test/suite/backup/r/backup_online_testing.result
R mysql-test/suite/backup_engines/r/backup_ptr_commit_row.result => mysql-test/suite/backup_ptr/r/backup_ptr_commits.result
R mysql-test/suite/backup_engines/r/backup_tmp_tables.result => mysql-test/suite/backup/r/backup_tmp_tables.result
R mysql-test/suite/backup_engines/t/backup_functions.test => mysql-test/suite/backup/t/backup_functions.test
R mysql-test/suite/backup_engines/t/backup_online_testing.test => mysql-test/suite/backup/t/backup_online_testing.test
R mysql-test/suite/backup_engines/t/backup_tmp_tables.test => mysql-test/suite/backup/t/backup_tmp_tables.test
R sql/ddl_blocker.cc => sql/bml.cc
R sql/ddl_blocker.h => sql/bml.h
M .bzrignore
M client/CMakeLists.txt
M client/Makefile.am
M include/my_sys.h
M libmysqld/CMakeLists.txt
M libmysqld/Makefile.am
M mysql-test/Makefile.am
M mysql-test/include/test_fieldsize.inc
M mysql-test/include/wait_for_status_var.inc
M mysql-test/mysql-test-run.pl
M mysql-test/r/debug_sync.result
M mysql-test/r/myisam_keycache_coverage.result
M mysql-test/r/myisamlog.result
M mysql-test/suite/backup/r/backup.result
M mysql-test/suite/backup/r/backup_backupdir.result
M mysql-test/suite/backup/r/backup_compression.result
M mysql-test/suite/backup/r/backup_db_grants.result
M mysql-test/suite/backup/r/backup_errors.result
M mysql-test/suite/backup/r/backup_lock_myisam.result
M mysql-test/suite/backup/r/backup_logs.result
M mysql-test/suite/backup/r/backup_logs_output.result
M mysql-test/suite/backup/r/backup_procedures.result
M mysql-test/suite/backup/r/backup_tablespace.result
M mysql-test/suite/backup/r/backup_timeout.result
M mysql-test/suite/backup/r/backup_views.result
M mysql-test/suite/backup/t/backup.test
M mysql-test/suite/backup/t/backup_backupdir.test
M mysql-test/suite/backup/t/backup_charsets.test
M mysql-test/suite/backup/t/backup_compression.test
M mysql-test/suite/backup/t/backup_concurrent.test
M mysql-test/suite/backup/t/backup_datatypes.test
M mysql-test/suite/backup/t/backup_db_grants.test
M mysql-test/suite/backup/t/backup_default.test
M mysql-test/suite/backup/t/backup_errors.test
M mysql-test/suite/backup/t/backup_fkey.test
M mysql-test/suite/backup/t/backup_lock_myisam.test
M mysql-test/suite/backup/t/backup_logs.test
M mysql-test/suite/backup/t/backup_logs_output-master.opt
M mysql-test/suite/backup/t/backup_logs_output.test
M mysql-test/suite/backup/t/backup_logs_purge.test
M mysql-test/suite/backup/t/backup_many_dbs.test
M mysql-test/suite/backup/t/backup_maria.test
M mysql-test/suite/backup/t/backup_multi_blocks.test
M mysql-test/suite/backup/t/backup_myisam.test
M mysql-test/suite/backup/t/backup_myisam_coverage.test
M mysql-test/suite/backup/t/backup_myisam_extlocking.test
M mysql-test/suite/backup/t/backup_myisam_sync.test
M mysql-test/suite/backup/t/backup_no_be.test
M mysql-test/suite/backup/t/backup_no_data.test
M mysql-test/suite/backup/t/backup_no_engine.test
M mysql-test/suite/backup/t/backup_nodata_driver.test
M mysql-test/suite/backup/t/backup_objects.test
M mysql-test/suite/backup/t/backup_procedures.test
M mysql-test/suite/backup/t/backup_security.test
M mysql-test/suite/backup/t/backup_snapshot.test
M mysql-test/suite/backup/t/backup_tablespace.test
M mysql-test/suite/backup/t/backup_timeout.test
M mysql-test/suite/backup/t/backup_triggers_and_events.test
M mysql-test/suite/backup/t/backup_views.test
M mysql-test/suite/backup/t/disabled.def
M mysql-test/suite/backup_engines/combinations
M mysql-test/suite/backup_engines/r/backup_partition.result
M mysql-test/suite/backup_engines/r/backup_partitioning.result
M mysql-test/suite/backup_engines/t/backup_partition.test
M mysql-test/suite/backup_engines/t/backup_partitioning.test
M mysql-test/suite/backup_engines/t/backup_triggers.test
M mysql-test/suite/funcs_1/r/is_columns_mysql.result
M mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
M mysql-test/suite/rpl/r/rpl_backup.result
M mysql-test/suite/rpl/r/rpl_flushlog_loop.result
M mysql-test/suite/rpl/r/rpl_log_pos.result
M mysql-test/suite/rpl/t/disabled.def
M mysql-test/suite/rpl/t/rpl_backup.test
M mysql-test/t/debug_sync.test
M mysql-test/t/disabled.def
M mysql-test/t/myisam_keycache_coverage.test
M mysql-test/t/myisamlog.test
M mysql-test/t/union.test
M mysql-test/valgrind.supp
M mysys/my_lock.c
M mysys/my_malloc.c
M mysys/my_static.c
M mysys/safemalloc.c
M scripts/mysql_system_tables.sql
M sql/CMakeLists.txt
M sql/Makefile.am
M sql/backup/backup_aux.h
M sql/backup/backup_engine.h
M sql/backup/backup_info.cc
M sql/backup/backup_kernel.h
M sql/backup/backup_test.cc
M sql/backup/be_default.cc
M sql/backup/be_nodata.cc
M sql/backup/be_nodata.h
M sql/backup/be_snapshot.cc
M sql/backup/be_thread.cc
M sql/backup/data_backup.cc
M sql/backup/image_info.cc
M sql/backup/image_info.h
M sql/backup/kernel.cc
M sql/backup/logger.cc
M sql/backup/logger.h
M sql/backup/stream.cc
M sql/backup/stream.h
M sql/backup/stream_v1.c
M sql/backup/stream_v1_services.h
M sql/backup/stream_v1_transport.c
M sql/debug_sync.cc
M sql/debug_sync.h
M sql/handler.cc
M sql/lex.h
M sql/log.cc
M sql/mysql_priv.h
M sql/mysqld.cc
M sql/rpl_handler.cc
M sql/rpl_mi.cc
M sql/rpl_mi.h
M sql/rpl_rli.cc
M sql/rpl_rli.h
M sql/set_var.cc
M sql/share/errmsg.txt
M sql/si_objects.cc
M sql/si_objects.h
M sql/slave.cc
M sql/slave.h
M sql/sql_acl.cc
M sql/sql_binlog.cc
M sql/sql_class.cc
M sql/sql_class.h
M sql/sql_lex.cc
M sql/sql_parse.cc
M sql/sql_repl.cc
M sql/sql_yacc.yy
M storage/archive/CMakeLists.txt
M storage/myisam/mi_close.c
M storage/myisam/mi_examine_log.c
M storage/myisam/mi_locking.c
M storage/myisam/mi_log.c
M storage/myisam/myisamlog.c
M storage/myisammrg/ha_myisammrg.cc
M mysql-test/suite/backup/r/backup_bml.result
M mysql-test/suite/backup/r/backup_securebackup.result
M mysql-test/suite/backup/t/backup_bml.test
M mysql-test/suite/backup/t/backup_securebackup-master.opt
M mysql-test/suite/backup/t/backup_securebackup.test
M mysql-test/suite/backup_ptr/t/backup_ptr.test
M mysql-test/suite/backup_ptr/t/backup_ptr_commits.test
M mysql-test/suite/backup_ptr/t/backup_ptr_objects.test
M mysql-test/suite/backup_engines/include/not_falcon.inc
M mysql-test/suite/backup_engines/include/not_innodb.inc
M mysql-test/suite/backup_engines/include/not_memory.inc
M mysql-test/suite/backup_engines/include/not_myisam.inc
M mysql-test/suite/backup/r/backup_functions.result
M mysql-test/suite/backup_ptr/r/backup_ptr_commits.result
M mysql-test/suite/backup/t/backup_functions.test
M mysql-test/suite/backup/t/backup_online_testing.test
M sql/bml.cc
M sql/bml.h
2599.389.7 Sergey Petrunia 2009-03-26
Fix typo
@ sql/sql_select.cc
Fix typo
M sql/sql_select.cc
2599.389.6 Sergey Petrunia 2009-03-21
BUG#42740: crash in optimize_semijoin_nests
- Run pull_out_semijoin_tables() after range analysis, not before it. We need to
do it in this order because range analysis may mark tables as constant, and then
pull_out_semijoin_nests() will remove semi-join nests that contain only constant
tables. This removal operation is crucial as setup_sj_materialization() cannot deal
with semi-join nests that have only constant tables.
@ mysql-test/r/subselect_sj2.result
BUG#42740: crash in optimize_semijoin_nests
- Testcase
@ mysql-test/t/subselect_sj2.test
BUG#42740: crash in optimize_semijoin_nests
- Testcase
@ sql/sql_select.cc
BUG#42740: crash in optimize_semijoin_nests
- Run pull_out_semijoin_tables() after range analysis, not before it. We need to
do it in this order because range analysis may mark tables as constant, and then
pull_out_semijoin_nests() will remove semi-join nests that contain only constant
tables. This removal operation is crucial as setup_sj_materialization() cannot deal
with semi-join nests that have only constant tables.
M mysql-test/r/subselect_sj2.result
M mysql-test/t/subselect_sj2.test
M sql/sql_select.cc
2599.389.5 Sergey Petrunia 2009-03-20 [merge]
Merge mysql-6.0 -> mysql-6.0-opt
D mysql-test/include/UnicodeData.txt
D mysql-test/r/test_wl4435.result
D mysql-test/suite/sys_vars/t/completion_type_func-master.opt
D sql-bench/TODO
A mysql-test/collections/
A mysql-test/collections/README
A mysql-test/collections/README.experimental
A mysql-test/collections/default.daily
A mysql-test/collections/default.experimental
A mysql-test/collections/default.push
A mysql-test/collections/default.weekly
A mysql-test/include/wait_show_condition.inc
A mysql-test/r/innodb-consistent.result
A mysql-test/r/innodb_bug42419.result
A mysql-test/r/innodb_ctype_ldml.result
A mysql-test/r/mdl_sync.result
A mysql-test/r/signal.result
A mysql-test/r/signal_code.result
A mysql-test/r/signal_demo1.result
A mysql-test/r/signal_demo2.result
A mysql-test/r/signal_demo3.result
A mysql-test/r/signal_sqlmode.result
A mysql-test/r/signal_utf32.result
A mysql-test/suite/binlog/r/binlog_sql_mode.result
A mysql-test/suite/binlog/t/binlog_sql_mode.test
A mysql-test/suite/falcon/r/falcon_blob_space-big.result
A mysql-test/suite/falcon/r/falcon_bug_23692.result
A mysql-test/suite/falcon/r/falcon_bug_33719.result
A mysql-test/suite/falcon/r/falcon_bug_34182.result
A mysql-test/suite/falcon/r/falcon_bug_34478.result
A mysql-test/suite/falcon/r/falcon_bug_42478.result
A mysql-test/suite/falcon/t/falcon_blob_space-big.cnf
A mysql-test/suite/falcon/t/falcon_blob_space-big.test
A mysql-test/suite/falcon/t/falcon_bug_23692.test
A mysql-test/suite/falcon/t/falcon_bug_33719.test
A mysql-test/suite/falcon/t/falcon_bug_34182.test
A mysql-test/suite/falcon/t/falcon_bug_34478.test
A mysql-test/suite/falcon/t/falcon_bug_42478.test
A mysql-test/suite/rpl/r/rpl_mixed_bit_pk.result
A mysql-test/suite/rpl/r/rpl_slave_load_in.result
A mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result
A mysql-test/suite/rpl/t/rpl_mixed_bit_pk.test
A mysql-test/suite/rpl/t/rpl_slave_load_in.test
A mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test
A mysql-test/t/innodb-consistent-master.opt
A mysql-test/t/innodb-consistent.test
A mysql-test/t/innodb_bug42419.test
A mysql-test/t/innodb_ctype_ldml-master.opt
A mysql-test/t/innodb_ctype_ldml.test
A mysql-test/t/mdl_sync.test
A mysql-test/t/signal.test
A mysql-test/t/signal_code.test
A mysql-test/t/signal_demo1.test
A mysql-test/t/signal_demo2.test
A mysql-test/t/signal_demo3.test
A mysql-test/t/signal_sqlmode.test
A mysql-test/t/signal_utf32.test
A sql/sql_signal.cc
A sql/sql_signal.h
A storage/falcon/SRLTableSpaces.cpp
A storage/falcon/SRLTableSpaces.h
A storage/ibmdb2i/
A storage/ibmdb2i/CMakeLists.txt
A storage/ibmdb2i/Makefile.am
A storage/ibmdb2i/db2i_blobCollection.cc
A storage/ibmdb2i/db2i_blobCollection.h
A storage/ibmdb2i/db2i_charsetSupport.cc
A storage/ibmdb2i/db2i_charsetSupport.h
A storage/ibmdb2i/db2i_collationSupport.cc
A storage/ibmdb2i/db2i_collationSupport.h
A storage/ibmdb2i/db2i_constraints.cc
A storage/ibmdb2i/db2i_conversion.cc
A storage/ibmdb2i/db2i_errors.cc
A storage/ibmdb2i/db2i_errors.h
A storage/ibmdb2i/db2i_file.cc
A storage/ibmdb2i/db2i_file.h
A storage/ibmdb2i/db2i_global.h
A storage/ibmdb2i/db2i_iconv.h
A storage/ibmdb2i/db2i_ileBridge.cc
A storage/ibmdb2i/db2i_ileBridge.h
A storage/ibmdb2i/db2i_ioBuffers.cc
A storage/ibmdb2i/db2i_ioBuffers.h
A storage/ibmdb2i/db2i_misc.h
A storage/ibmdb2i/db2i_myconv.cc
A storage/ibmdb2i/db2i_myconv.h
A storage/ibmdb2i/db2i_rir.cc
A storage/ibmdb2i/db2i_safeString.h
A storage/ibmdb2i/db2i_sqlStatementStream.cc
A storage/ibmdb2i/db2i_sqlStatementStream.h
A storage/ibmdb2i/db2i_validatedPointer.h
A storage/ibmdb2i/ha_ibmdb2i.cc
A storage/ibmdb2i/ha_ibmdb2i.h
A storage/ibmdb2i/plug.in
M .bzr-mysql/default.conf
M .bzrignore
M CMakeLists.txt
M client/mysql.cc
M client/mysqldump.c
M client/mysqltest.cc
M cmd-line-utils/libedit/makelist.sh
M cmd-line-utils/libedit/readline.c
M cmd-line-utils/libedit/readline/readline.h
M cmd-line-utils/libedit/vi.c
M config/ac-macros/ha_ndbcluster.m4
M config/ac-macros/plugins.m4
M configure.in
M include/my_getopt.h
M include/my_global.h
M include/my_md5.h
M include/my_sys.h
M include/mysql.h
M include/mysql.h.pp
M include/thr_lock.h
M libmysql/libmysql.c
M libmysqld/CMakeLists.txt
M libmysqld/Makefile.am
M libmysqld/lib_sql.cc
M mysql-test/Makefile.am
M mysql-test/extra/rpl_tests/rpl_row_func003.test
M mysql-test/include/check-warnings.test
M mysql-test/include/handler.inc
M mysql-test/include/ndb_backup.inc
M mysql-test/include/wait_until_connected_again.inc
M mysql-test/include/wait_until_count_sessions.inc
M mysql-test/lib/My/ConfigFactory.pm
M mysql-test/lib/My/Platform.pm
M mysql-test/lib/My/SafeProcess.pm
M mysql-test/lib/My/SafeProcess/safe_process.cc
M mysql-test/lib/mtr_gcov.pl
M mysql-test/lib/mtr_report.pm
M mysql-test/lib/mtr_unique.pm
M mysql-test/mysql-test-run.pl
M mysql-test/r/comment_column.result
M mysql-test/r/comment_table.result
M mysql-test/r/connect.result
M mysql-test/r/consistent_snapshot.result
M mysql-test/r/ddl_i18n_koi8r.result
M mysql-test/r/ddl_i18n_utf8.result
M mysql-test/r/debug_sync.result
M mysql-test/r/dirty_close.result
M mysql-test/r/events_bugs.result
M mysql-test/r/explain.result
M mysql-test/r/flush_block_commit.result
M mysql-test/r/flush_block_commit_notembedded.result
M mysql-test/r/flush_read_lock_kill.result
M mysql-test/r/grant.result
M mysql-test/r/group_by.result
M mysql-test/r/group_min_max.result
M mysql-test/r/handler_innodb.result
M mysql-test/r/handler_myisam.result
M mysql-test/r/information_schema_db.result
M mysql-test/r/innodb.result
M mysql-test/r/key_cache.result
M mysql-test/r/lock.result
M mysql-test/r/lock_multi.result
M mysql-test/r/locktrans_innodb.result
M mysql-test/r/locktrans_myisam.result
M mysql-test/r/log_tables.result
M mysql-test/r/merge.result
M mysql-test/r/mysql.result
M mysql-test/r/mysql_client_test.result
M mysql-test/r/mysqlbinlog.result
M mysql-test/r/mysqlcheck.result
M mysql-test/r/mysqldump-max.result
M mysql-test/r/mysqldump.result
M mysql-test/r/mysqltest.result
M mysql-test/r/openssl_1.result
M mysql-test/r/preload.result
M mysql-test/r/ps.result
M mysql-test/r/query_cache_debug.result
M mysql-test/r/read_only.result
M mysql-test/r/repair.result
M mysql-test/r/row.result
M mysql-test/r/select.result
M mysql-test/r/select_jcl6.result
M mysql-test/r/show_check.result
M mysql-test/r/skip_name_resolve.result
M mysql-test/r/sp-security.result
M mysql-test/r/system_mysql_db.result
M mysql-test/r/trigger-compat.result
M mysql-test/r/variables.result
M mysql-test/r/view.result
M mysql-test/r/view_grant.result
M mysql-test/suite/backup/r/backup_backupdir.result
M mysql-test/suite/backup/r/backup_db_grants.result
M mysql-test/suite/backup/r/backup_objects.result
M mysql-test/suite/backup/t/backup_datatypes.test
M mysql-test/suite/backup/t/backup_logs.test
M mysql-test/suite/binlog/r/binlog_auto_increment_bug33029.result
M mysql-test/suite/binlog/r/binlog_unsafe.result
M mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test
M mysql-test/suite/binlog/t/binlog_unsafe.test
M mysql-test/suite/falcon/r/falcon_bug_33148.result
M mysql-test/suite/falcon/r/falcon_options.result
M mysql-test/suite/falcon/r/falcon_options2.result
M mysql-test/suite/falcon/t/disabled.def
M mysql-test/suite/funcs_1/r/falcon_views.result
M mysql-test/suite/funcs_1/r/innodb_views.result
M mysql-test/suite/funcs_1/r/is_columns_falcon.result
M mysql-test/suite/funcs_1/r/is_columns_innodb.result
M mysql-test/suite/funcs_1/r/is_columns_memory.result
M mysql-test/suite/funcs_1/r/is_columns_myisam.result
M mysql-test/suite/funcs_1/r/is_columns_mysql.result
M mysql-test/suite/funcs_1/r/memory_views.result
M mysql-test/suite/funcs_1/r/myisam_views.result
M mysql-test/suite/funcs_1/r/ndb_views.result
M mysql-test/suite/funcs_1/r/storedproc.result
M mysql-test/suite/funcs_1/t/disabled.def
M mysql-test/suite/maria/r/maria-preload.result
M mysql-test/suite/ndb/r/ndb_alter_table_online.result
M mysql-test/suite/ndb/r/ndb_blob_restore.result
M mysql-test/suite/ndb/r/ndb_restore.result
M mysql-test/suite/ndb/r/ndb_restore_partition.result
M mysql-test/suite/ndb/r/ndb_restore_print.result
M mysql-test/suite/ndb/t/ndb_read_multi_range.test
M mysql-test/suite/ndb_binlog/r/ndb_binlog_restore.result
M mysql-test/suite/ndb_team/r/ndb_dd_backuprestore.result
M mysql-test/suite/ndb_team/t/ndb_autodiscover.test
M mysql-test/suite/parts/r/ndb_dd_backuprestore.result
M mysql-test/suite/parts/r/partition_auto_increment_ndb.result
M mysql-test/suite/rpl/r/rpl_failed_optimize.result
M mysql-test/suite/rpl/r/rpl_heartbeat.result
M mysql-test/suite/rpl/r/rpl_locktrans_falcon.result
M mysql-test/suite/rpl/r/rpl_locktrans_innodb.result
M mysql-test/suite/rpl/r/rpl_locktrans_myisam.result
M mysql-test/suite/rpl/r/rpl_row_until.result
M mysql-test/suite/rpl/r/rpl_spec_variables.result
M mysql-test/suite/rpl/t/disabled.def
M mysql-test/suite/rpl/t/rpl_heartbeat.test
M mysql-test/suite/rpl/t/rpl_row_until.test
M mysql-test/suite/rpl/t/rpl_spec_variables.test
M mysql-test/suite/rpl_ndb_big/r/rpl_ndb_sync.result
M mysql-test/suite/rpl_ndb_big/t/disabled.def
M mysql-test/suite/rpl_ndb_big/t/rpl_ndb_circular_simplex.test
M mysql-test/suite/sys_vars/r/auto_increment_increment_basic.result
M mysql-test/suite/sys_vars/r/auto_increment_increment_func.result
M mysql-test/suite/sys_vars/r/auto_increment_offset_basic.result
M mysql-test/suite/sys_vars/r/auto_increment_offset_func.result
M mysql-test/suite/sys_vars/r/completion_type_func.result
M mysql-test/suite/sys_vars/r/concurrent_insert_basic.result
M mysql-test/suite/sys_vars/r/connect_timeout_basic.result
M mysql-test/suite/sys_vars/r/default_week_format_basic.result
M mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result
M mysql-test/suite/sys_vars/r/div_precision_increment_basic.result
M mysql-test/suite/sys_vars/r/expire_logs_days_basic.result
M mysql-test/suite/sys_vars/r/group_concat_max_len_basic.result
M mysql-test/suite/sys_vars/r/interactive_timeout_basic.result
M mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result
M mysql-test/suite/sys_vars/r/max_binlog_size_basic.result
M mysql-test/suite/sys_vars/r/max_connections_basic.result
M mysql-test/suite/sys_vars/r/max_delayed_threads_basic.result
M mysql-test/suite/sys_vars/r/max_error_count_basic.result
M mysql-test/suite/sys_vars/r/max_insert_delayed_threads_basic.result
M mysql-test/suite/sys_vars/r/max_length_for_sort_data_basic.result
M mysql-test/suite/sys_vars/r/max_prepared_stmt_count_basic.result
M mysql-test/suite/sys_vars/r/max_relay_log_size_basic.result
M mysql-test/suite/sys_vars/r/max_sort_length_basic.result
M mysql-test/suite/sys_vars/r/max_sp_recursion_depth_basic.result
M mysql-test/suite/sys_vars/r/myisam_data_pointer_size_basic.result
M mysql-test/suite/sys_vars/r/net_buffer_length_basic.result
M mysql-test/suite/sys_vars/r/net_read_timeout_basic.result
M mysql-test/suite/sys_vars/r/net_write_timeout_basic.result
M mysql-test/suite/sys_vars/r/optimizer_prune_level_basic.result
M mysql-test/suite/sys_vars/r/optimizer_search_depth_basic.result
M mysql-test/suite/sys_vars/r/preload_buffer_size_basic.result
M mysql-test/suite/sys_vars/r/read_buffer_size_basic.result
M mysql-test/suite/sys_vars/r/read_rnd_buffer_size_basic.result
M mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_32.result
M mysql-test/suite/sys_vars/r/server_id_basic_32.result
M mysql-test/suite/sys_vars/r/server_id_basic_64.result
M mysql-test/suite/sys_vars/r/slave_net_timeout_basic.result
M mysql-test/suite/sys_vars/r/slow_launch_time_basic.result
M mysql-test/suite/sys_vars/r/table_definition_cache_basic.result
M mysql-test/suite/sys_vars/r/table_lock_wait_timeout_basic.result
M mysql-test/suite/sys_vars/r/table_open_cache_basic.result
M mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result
M mysql-test/suite/sys_vars/t/completion_type_func.test
M mysql-test/t/alter_table-big.test
M mysql-test/t/comment_column.test
M mysql-test/t/comment_table.test
M mysql-test/t/connect.test
M mysql-test/t/consistent_snapshot.test
M mysql-test/t/ddl_i18n_koi8r.test
M mysql-test/t/ddl_i18n_utf8.test
M mysql-test/t/dirty_close.test
M mysql-test/t/disabled.def
M mysql-test/t/drop.test
M mysql-test/t/events_bugs.test
M mysql-test/t/explain.test
M mysql-test/t/flush_block_commit.test
M mysql-test/t/flush_block_commit_notembedded.test
M mysql-test/t/flush_read_lock_kill.test
M mysql-test/t/func_group.test
M mysql-test/t/group_by.test
M mysql-test/t/group_min_max.test
M mysql-test/t/init_connect.test
M mysql-test/t/innodb.test
M mysql-test/t/innodb_mysql.test
M mysql-test/t/lock.test
M mysql-test/t/lock_multi.test
M mysql-test/t/log_tables.test
M mysql-test/t/merge.test
M mysql-test/t/mysql.test
M mysql-test/t/mysql_client_test.test
M mysql-test/t/mysqlbinlog.test
M mysql-test/t/mysqldump-compat.test
M mysql-test/t/mysqldump.test
M mysql-test/t/mysqltest.test
M mysql-test/t/partition.test
M mysql-test/t/ps.test
M mysql-test/t/query_cache_28249.test
M mysql-test/t/query_cache_debug.test
M mysql-test/t/read_only.test
M mysql-test/t/row.test
M mysql-test/t/select.test
M mysql-test/t/show_check.test
M mysql-test/t/skip_name_resolve.test
M mysql-test/t/sp-security.test
M mysql-test/t/sp_notembedded.test
M mysql-test/t/ssl-big.test
M mysql-test/t/ssl.test
M mysql-test/t/ssl_compress.test
M mysql-test/t/status.test
M mysql-test/t/trigger-compat.test
M mysql-test/t/type_bit_innodb.test
M mysql-test/t/upgrade.test
M mysql-test/t/user_limits.test
M mysql-test/t/variables.test
M mysql-test/t/view.test
M mysql-test/t/view_grant.test
M mysql-test/t/wait_timeout.test
M mysql-test/t/xa.test
M mysys/default.c
M mysys/errors.c
M mysys/md5.c
M mysys/my_fstream.c
M mysys/my_getopt.c
M mysys/my_pread.c
M mysys/my_write.c
M plugin/Makefile.am
M scripts/mysql_system_tables.sql
M scripts/mysql_system_tables_fix.sql
M scripts/mysqldumpslow.sh
M sql-common/client.c
M sql/CMakeLists.txt
M sql/Makefile.am
M sql/backup/backup_aux.h
M sql/backup/backup_info.cc
M sql/derror.cc
M sql/event_db_repository.cc
M sql/event_scheduler.cc
M sql/ha_ndbcluster_binlog.cc
M sql/ha_partition.cc
M sql/ha_partition.h
M sql/handler.cc
M sql/item.cc
M sql/item.h
M sql/item_cmpfunc.cc
M sql/item_func.cc
M sql/item_strfunc.cc
M sql/item_sum.cc
M sql/lex.h
M sql/lock.cc
M sql/log.cc
M sql/log_event.cc
M sql/log_event.h
M sql/mdl.cc
M sql/mdl.h
M sql/mysql_priv.h
M sql/mysqld.cc
M sql/opt_range.cc
M sql/protocol.cc
M sql/protocol.h
M sql/rpl_record.cc
M sql/rpl_rli.cc
M sql/rpl_rli.h
M sql/set_var.cc
M sql/share/errmsg.txt
M sql/si_objects.cc
M sql/slave.cc
M sql/sp.cc
M sql/sp_head.cc
M sql/sp_pcontext.h
M sql/sp_rcontext.cc
M sql/sp_rcontext.h
M sql/sql_acl.cc
M sql/sql_base.cc
M sql/sql_cache.cc
M sql/sql_class.cc
M sql/sql_class.h
M sql/sql_delete.cc
M sql/sql_error.cc
M sql/sql_error.h
M sql/sql_handler.cc
M sql/sql_insert.cc
M sql/sql_lex.cc
M sql/sql_lex.h
M sql/sql_load.cc
M sql/sql_parse.cc
M sql/sql_plist.h
M sql/sql_plugin.cc
M sql/sql_prepare.cc
M sql/sql_prepare.h
M sql/sql_select.cc
M sql/sql_servers.cc
M sql/sql_show.cc
M sql/sql_table.cc
M sql/sql_trigger.cc
M sql/sql_udf.cc
M sql/sql_yacc.yy
M sql/table.cc
M sql/table.h
M sql/thr_malloc.cc
M sql/unireg.cc
M storage/Makefile.am
M storage/falcon/CMakeLists.txt
M storage/falcon/Cache.cpp
M storage/falcon/Cache.h
M storage/falcon/Collation.h
M storage/falcon/CollationCaseless.cpp
M storage/falcon/CollationCaseless.h
M storage/falcon/CollationUnknown.cpp
M storage/falcon/CollationUnknown.h
M storage/falcon/Connection.cpp
M storage/falcon/Database.cpp
M storage/falcon/Dbb.cpp
M storage/falcon/Dbb.h
M storage/falcon/DeferredIndex.cpp
M storage/falcon/DeferredIndex.h
M storage/falcon/Event.cpp
M storage/falcon/IO.cpp
M storage/falcon/Index.cpp
M storage/falcon/Index.h
M storage/falcon/IndexPage.cpp
M storage/falcon/IndexPage.h
M storage/falcon/IndexRootPage.cpp
M storage/falcon/IndexRootPage.h
M storage/falcon/Log.h
M storage/falcon/Makefile.am
M storage/falcon/MemMgr.cpp
M storage/falcon/Mutex.cpp
M storage/falcon/Mutex.h
M storage/falcon/MySQLCollation.cpp
M storage/falcon/MySQLCollation.h
M storage/falcon/NBitmap.cpp
M storage/falcon/NInSelectBitmap.cpp
M storage/falcon/PageInventoryPage.cpp
M storage/falcon/PageWriter.cpp
M storage/falcon/PriorityScheduler.cpp
M storage/falcon/RecordScavenge.cpp
M storage/falcon/RecordScavenge.h
M storage/falcon/RecordVersion.cpp
M storage/falcon/SRLCreateIndex.cpp
M storage/falcon/SRLCreateIndex.h
M storage/falcon/SRLCreateTableSpace.cpp
M storage/falcon/SRLDeleteIndex.cpp
M storage/falcon/SRLDeleteIndex.h
M storage/falcon/SRLVersion.h
M storage/falcon/Sequence.cpp
M storage/falcon/Sequence.h
M storage/falcon/SequenceManager.cpp
M storage/falcon/SequenceManager.h
M storage/falcon/SerialLog.cpp
M storage/falcon/SerialLogControl.cpp
M storage/falcon/SerialLogControl.h
M storage/falcon/SerialLogFile.cpp
M storage/falcon/SerialLogRecord.h
M storage/falcon/StorageDatabase.cpp
M storage/falcon/StorageDatabase.h
M storage/falcon/StorageTable.cpp
M storage/falcon/StorageVersion.h
M storage/falcon/SyncObject.cpp
M storage/falcon/Table.cpp
M storage/falcon/Table.h
M storage/falcon/TableSpaceManager.cpp
M storage/falcon/TableSpaceManager.h
M storage/falcon/Thread.cpp
M storage/falcon/Transaction.cpp
M storage/falcon/ValueSet.cpp
M storage/falcon/ha_falcon.cpp
M storage/falcon/plug.in
M storage/innobase/dict/dict0load.c
M storage/innobase/fsp/fsp0fsp.c
M storage/innobase/handler/ha_innodb.cc
M storage/innobase/handler/ha_innodb.h
M storage/innobase/ibuf/ibuf0ibuf.c
M storage/innobase/include/rem0rec.h
M storage/innobase/include/rem0rec.ic
M storage/innobase/include/trx0roll.h
M storage/innobase/lock/lock0lock.c
M storage/innobase/os/os0thread.c
M storage/innobase/row/row0sel.c
M storage/innobase/trx/trx0roll.c
M storage/innobase/trx/trx0trx.c
M storage/maria/ma_non_trans_log.c
M storage/maria/plug.in
M storage/myisam/ha_myisam.cc
M storage/myisam/mi_locking.c
M storage/myisam/myisamchk.c
M storage/myisam/myisamdef.h
M storage/myisammrg/ha_myisammrg.cc
M support-files/Makefile.am
M support-files/mysql.spec.sh
M tests/mysql_client_test.c
2599.389.4 Igor Babaev 2009-03-09
Correction to avoid warnings.
M sql/sql_select.cc
2599.389.3 Igor Babaev 2009-03-09
Fixed bug #42955.
If a join buffer is employed to join a table through BNL or
BKA algorithm for a query with a ORDER BY / GROUP BY clause
then the result set has always to be sorted unless the clause
can be optimized away.
@ mysql-test/r/join_cache.result
Added a test case for bug #42955.
Adjusted results for a test case.
@ mysql-test/r/join_outer.result
Changed a test case to make it predictable after the fix
for bug #42955.
@ mysql-test/r/join_outer_jcl6.result
Changed a test case to make it predictable after the fix
for bug #42955.
@ mysql-test/r/select_jcl6.result
Adjusted results after the fix for bug #42955.
@ mysql-test/t/join_cache.test
Added a test case for bug #42955.
@ mysql-test/t/join_outer.test
Changed a test case to make it predictable after the fix
for bug #42955.
@ sql/sql_select.cc
If a join buffer is is used to join a table the ordering by an index
for the first non-constant table cannot be employed anymore.
@ sql/sql_select.h
Added the method get_sort_by_join_tab to the the JOIN class.
It returns the table for which an index scan can be used to
satisfy the sort order needed by the ORDER BY/GROUP BY clause.
M mysql-test/r/join_cache.result
M mysql-test/r/join_outer.result
M mysql-test/r/join_outer_jcl6.result
M mysql-test/r/select_jcl6.result
M mysql-test/t/join_cache.test
M mysql-test/t/join_outer.test
M sql/sql_select.cc
M sql/sql_select.h
2599.389.2 Sergey Petrunia 2009-03-01
BUG#41890: Falcon: New execution plans with MRR cause slowdown for group of queries
- Testcase
@ mysql-test/suite/falcon/r/falcon_bug_41890.result
BUG#41890: Falcon: New execution plans with MRR cause slowdown for group of queries
- Testcase
@ mysql-test/suite/falcon/t/falcon_bug_41890.test
BUG#41890: Falcon: New execution plans with MRR cause slowdown for group of queries
- Testcase
A mysql-test/suite/falcon/r/falcon_bug_41890.result
A mysql-test/suite/falcon/t/falcon_bug_41890.test
=== modified file 'client/mysqlbinlog.cc'
--- a/client/mysqlbinlog.cc 2009-03-17 20:07:27 +0000
+++ b/client/mysqlbinlog.cc 2009-04-21 09:28:48 +0000
@@ -1302,7 +1302,6 @@ static int parse_args(int *argc, char***
int ho_error;
result_file = stdout;
- load_defaults("my",load_default_groups,argc,argv);
if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option)))
exit(ho_error);
if (debug_info_flag)
@@ -1956,8 +1955,9 @@ int main(int argc, char** argv)
my_init_time(); // for time functions
+ load_defaults("my", load_default_groups, &argc, &argv);
+ defaults_argv= argv;
parse_args(&argc, (char***)&argv);
- defaults_argv=argv;
if (!argc)
{
=== modified file 'extra/my_print_defaults.c'
--- a/extra/my_print_defaults.c 2007-05-10 09:59:39 +0000
+++ b/extra/my_print_defaults.c 2009-04-21 09:27:46 +0000
@@ -192,7 +192,8 @@ int main(int argc, char **argv)
}
for (argument= arguments+1 ; *argument ; argument++)
- puts(*argument);
+ if (*argument != args_separator) /* skip arguments separator */
+ puts(*argument);
my_free((char*) load_default_groups,MYF(0));
free_defaults(arguments);
=== modified file 'include/my_sys.h'
--- a/include/my_sys.h 2009-04-03 15:14:49 +0000
+++ b/include/my_sys.h 2009-04-21 09:27:46 +0000
@@ -917,6 +917,7 @@ extern void *memdup_root(MEM_ROOT *root,
extern int get_defaults_options(int argc, char **argv,
char **defaults, char **extra_defaults,
char **group_suffix);
+extern const char *args_separator;
extern int my_load_defaults(const char *conf_file, const char **groups,
int *argc, char ***argv, const char ***);
extern int load_defaults(const char *conf_file, const char **groups,
=== modified file 'mysql-test/include/setup_fake_relay_log.inc'
--- a/mysql-test/include/setup_fake_relay_log.inc 2009-02-09 13:17:04 +0000
+++ b/mysql-test/include/setup_fake_relay_log.inc 2009-04-21 09:40:24 +0000
@@ -69,7 +69,7 @@ let $_fake_relay_log_purge= `SELECT @@gl
# Create relay log file.
copy_file $fake_relay_log $_fake_relay_log;
# Create relay log index.
---exec echo $_fake_filename-fake.000001 > $_fake_relay_index
+--exec echo ./$_fake_filename-fake.000001 > $_fake_relay_index
# Setup replication from existing relay log.
eval CHANGE MASTER TO MASTER_HOST='dummy.localdomain', RELAY_LOG_FILE='$_fake_filename-fake.000001', RELAY_LOG_POS=4;
=== modified file 'mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test'
--- a/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test 2009-03-06 18:19:29 +0000
+++ b/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test 2009-04-21 09:40:24 +0000
@@ -26,7 +26,7 @@ let $MYSQLD_DATADIR= `select @@datadir`;
copy_file $MYSQL_TEST_DIR/std_data/bug33029-slave-relay-bin.000001 $MYSQLD_DATADIR/slave-relay-bin.000001;
write_file $MYSQLD_DATADIR/slave-relay-bin.index;
-slave-relay-bin.000001
+./slave-relay-bin.000001
EOF
change master to
=== modified file 'mysql-test/suite/rpl/r/rpl_change_master.result'
--- a/mysql-test/suite/rpl/r/rpl_change_master.result 2008-07-17 19:11:37 +0000
+++ b/mysql-test/suite/rpl/r/rpl_change_master.result 2009-04-21 09:40:24 +0000
@@ -100,3 +100,20 @@ n
1
2
drop table t1;
+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
+create table t1 (a int);
+insert into t1 values (1);
+flush logs;
+insert into t1 values (2);
+include/stop_slave.inc
+delete from t1 where a=2;
+CHANGE MASTER TO relay_log_file='slave-relay-bin.000005', relay_log_pos=4;
+start slave sql_thread;
+start slave io_thread;
+set global relay_log_purge=1;
+drop table t1;
=== modified file 'mysql-test/suite/rpl/t/rpl_change_master.test'
--- a/mysql-test/suite/rpl/t/rpl_change_master.test 2008-06-22 20:05:19 +0000
+++ b/mysql-test/suite/rpl/t/rpl_change_master.test 2009-04-21 09:40:24 +0000
@@ -31,3 +31,56 @@ drop table t1;
sync_slave_with_master;
# End of 4.1 tests
+
+#
+# BUG#12190 CHANGE MASTER has differ path requiremts on MASTER_LOG_FILE and RELAY_LOG_FILE
+#
+
+source include/master-slave-reset.inc;
+
+connection master;
+create table t1 (a int);
+insert into t1 values (1);
+flush logs;
+insert into t1 values (2);
+
+# Note: the master positon saved by this will also be used by the
+# 'sync_with_master' below.
+sync_slave_with_master;
+
+# Check if the table t1 and t2 are identical on master and slave;
+let $diff_table_1= master:test.t1
+let $diff_table_2= slave:test.t1
+source include/diff_tables.inc;
+
+connection slave;
+source include/stop_slave.inc;
+delete from t1 where a=2;
+
+# start replication from the second insert, after fix of BUG#12190,
+# relay_log_file does not use absolute path, only the filename is
+# required
+#
+# Note: the follow change master will automatically reset
+# relay_log_purge to false, save the old value to restore
+let $relay_log_purge= `select @@global.relay_log_purge`;
+CHANGE MASTER TO relay_log_file='slave-relay-bin.000005', relay_log_pos=4;
+start slave sql_thread;
+source include/wait_for_slave_sql_to_start.inc;
+
+# Sync to the same position saved by the 'sync_slave_with_master' above.
+sync_with_master;
+
+# Check if the table t1 and t2 are identical on master and slave;
+let $diff_table_1= master:test.t1
+let $diff_table_2= slave:test.t1
+source include/diff_tables.inc;
+
+# clean up
+connection slave;
+start slave io_thread;
+source include/wait_for_slave_io_to_start.inc;
+eval set global relay_log_purge=$relay_log_purge;
+connection master;
+drop table t1;
+sync_slave_with_master;
=== modified file 'mysql-test/t/mysqlbinlog.test'
--- a/mysql-test/t/mysqlbinlog.test 2009-03-06 20:33:52 +0000
+++ b/mysql-test/t/mysqlbinlog.test 2009-04-21 09:28:48 +0000
@@ -368,3 +368,27 @@ eval SET @@global.server_id= $save_serve
--remove_file $binlog_file
--echo End of 5.1 tests
+
+#
+# BUG#38468 Memory leak detected when using mysqlbinlog utility;
+#
+disable_query_log;
+RESET MASTER;
+CREATE TABLE t1 SELECT 1;
+FLUSH LOGS;
+DROP TABLE t1;
+enable_query_log;
+
+# Write an empty file for comparison
+write_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog.warn.empty;
+EOF
+
+# Before fix of BUG#38468, this would generate some warnings
+--exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000001 >/dev/null 2> $MYSQLTEST_VARDIR/tmp/mysqlbinlog.warn
+
+# Make sure the command above does not generate any error or warnings
+diff_files $MYSQLTEST_VARDIR/tmp/mysqlbinlog.warn $MYSQLTEST_VARDIR/tmp/mysqlbinlog.warn.empty;
+
+# Cleanup for this part of test
+remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog.warn.empty;
+remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog.warn;
=== modified file 'mysys/default.c'
--- a/mysys/default.c 2009-03-24 14:24:44 +0000
+++ b/mysys/default.c 2009-04-21 09:27:46 +0000
@@ -41,6 +41,29 @@
#include <winbase.h>
#endif
+/**
+ arguments separator
+
+ load_defaults() loads arguments from config file and put them
+ before the arguments from command line, this separator is used to
+ separate the arguments loaded from config file and arguments user
+ provided on command line.
+
+ Options with value loaded from config file are always in the form
+ '--option=value', while for command line options, the value can be
+ given as the next argument. Thus we used a separator so that
+ handle_options() can distinguish them.
+
+ Note: any other places that does not need to distinguish them
+ should skip the separator.
+
+ The content of arguments separator does not matter, one should only
+ check the pointer, use "----args-separator----" here to ease debug
+ if someone misused it.
+
+ See BUG#25192
+*/
+const char *args_separator= "----args-separator----";
const char *my_defaults_file=0;
const char *my_defaults_group_suffix=0;
char *my_defaults_extra_file=0;
@@ -454,10 +477,11 @@ int my_load_defaults(const char *conf_fi
goto err;
res= (char**) (ptr+sizeof(alloc));
res[0]= **argv; /* Copy program name */
+ /* set arguments separator */
+ res[1]= args_separator;
for (i=2 ; i < (uint) *argc ; i++)
- res[i-1]=argv[0][i];
- res[i-1]=0; /* End pointer */
- (*argc)--;
+ res[i]=argv[0][i];
+ res[i]=0; /* End pointer */
*argv=res;
*(MEM_ROOT*) ptr= alloc; /* Save alloc root for free */
if (default_directories)
@@ -487,7 +511,7 @@ int my_load_defaults(const char *conf_fi
or a forced default file
*/
if (!(ptr=(char*) alloc_root(&alloc,sizeof(alloc)+
- (args.elements + *argc +1) *sizeof(char*))))
+ (args.elements + *argc + 1 + 1) *sizeof(char*))))
goto err;
res= (char**) (ptr+sizeof(alloc));
@@ -508,12 +532,16 @@ int my_load_defaults(const char *conf_fi
--*argc; ++*argv; /* skip argument */
}
+ /* set arguments separator for arguments from config file and
+ command line */
+ res[args.elements+1]= args_separator;
+
if (*argc)
- memcpy((uchar*) (res+1+args.elements), (char*) ((*argv)+1),
+ memcpy((uchar*) (res+1+args.elements+1), (char*) ((*argv)+1),
(*argc-1)*sizeof(char*));
- res[args.elements+ *argc]=0; /* last null */
+ res[args.elements+ *argc+1]=0; /* last null */
- (*argc)+=args.elements;
+ (*argc)+=args.elements+1;
*argv= (char**) res;
*(MEM_ROOT*) ptr= alloc; /* Save alloc root for free */
delete_dynamic(&args);
@@ -523,7 +551,8 @@ int my_load_defaults(const char *conf_fi
printf("%s would have been started with the following arguments:\n",
**argv);
for (i=1 ; i < *argc ; i++)
- printf("%s ", (*argv)[i]);
+ if ((*argv)[i] != args_separator) /* skip arguments separator */
+ printf("%s ", (*argv)[i]);
puts("");
exit(0);
}
=== modified file 'mysys/my_getopt.c'
--- a/mysys/my_getopt.c 2009-04-03 15:14:49 +0000
+++ b/mysys/my_getopt.c 2009-04-21 09:27:46 +0000
@@ -119,6 +119,7 @@ int handle_options(int *argc, char ***ar
const struct my_option *optp;
uchar* *value;
int error, i;
+ my_bool is_cmdline_arg= 1;
LINT_INIT(opt_found);
/* handle_options() assumes arg0 (program name) always exists */
@@ -128,10 +129,34 @@ int handle_options(int *argc, char ***ar
(*argv)++; /* --- || ---- */
init_variables(longopts, init_one_value);
+ /*
+ Search for args_separator, if found, then the first part of the
+ arguments are loaded from configs
+ */
+ for (pos= *argv, pos_end=pos+ *argc; pos != pos_end ; pos++)
+ {
+ if (*pos == args_separator)
+ {
+ is_cmdline_arg= 0;
+ break;
+ }
+ }
+
for (pos= *argv, pos_end=pos+ *argc; pos != pos_end ; pos++)
{
char **first= pos;
char *cur_arg= *pos;
+ if (!is_cmdline_arg && (cur_arg == args_separator))
+ {
+ is_cmdline_arg= 1;
+
+ /* save the separator too if skip unkown options */
+ if (my_getopt_skip_unknown)
+ (*argv)[argvpos++]= cur_arg;
+ else
+ (*argc)--;
+ continue;
+ }
if (cur_arg[0] == '-' && cur_arg[1] && !end_of_options) /* must be opt */
{
char *argument= 0;
@@ -423,8 +448,12 @@ invalid value '%s'",
}
else if (optp->arg_type == REQUIRED_ARG && !optend)
{
- /* Check if there are more arguments after this one */
- if (!*++pos)
+ /* Check if there are more arguments after this one,
+
+ Note: options loaded from config file that requires value
+ should always be in the form '--option=value'.
+ */
+ if (!is_cmdline_arg || !*++pos)
{
if (my_getopt_print_errors)
my_getopt_error_reporter(ERROR_LEVEL,
=== modified file 'sql-common/client.c'
--- a/sql-common/client.c 2009-03-19 16:42:23 +0000
+++ b/sql-common/client.c 2009-04-21 09:27:46 +0000
@@ -1135,6 +1135,8 @@ void mysql_read_default_options(struct s
char **option=argv;
while (*++option)
{
+ if (option[0] == args_separator) /* skip arguments separator */
+ continue;
/* DBUG_PRINT("info",("option: %s",option[0])); */
if (option[0][0] == '-' && option[0][1] == '-')
{
=== modified file 'sql/sql_repl.cc'
--- a/sql/sql_repl.cc 2009-04-13 13:24:28 +0000
+++ b/sql/sql_repl.cc 2009-04-21 09:40:24 +0000
@@ -1513,9 +1513,11 @@ bool change_master(THD* thd, Master_info
if (lex_mi->relay_log_name)
{
need_relay_log_purge= 0;
- strmake(mi->rli->group_relay_log_name,lex_mi->relay_log_name,
+ char relay_log_name[FN_REFLEN];
+ mi->rli->relay_log.make_log_name(relay_log_name, lex_mi->relay_log_name);
+ strmake(mi->rli->group_relay_log_name, relay_log_name,
sizeof(mi->rli->group_relay_log_name)-1);
- strmake(mi->rli->event_relay_log_name,lex_mi->relay_log_name,
+ strmake(mi->rli->event_relay_log_name, relay_log_name,
sizeof(mi->rli->event_relay_log_name)-1);
}
=== modified file 'storage/ndb/test/run-test/setup.cpp'
--- a/storage/ndb/test/run-test/setup.cpp 2008-12-12 08:04:28 +0000
+++ b/storage/ndb/test/run-test/setup.cpp 2009-04-21 09:27:46 +0000
@@ -112,6 +112,8 @@ setup_config(atrt_config& config, const
*/
for (j = 0; j<(size_t)argc; j++)
{
+ if (tmp[j] == args_separator) /* skip arguments separator */
+ continue;
for (k = 0; proc_args[k].name; k++)
{
if (!strncmp(tmp[j], proc_args[k].name, strlen(proc_args[k].name)))
@@ -400,6 +402,12 @@ load_options(int argc, char** argv, int
{
for (size_t i = 0; i<(size_t)argc; i++)
{
+ /**
+ * Skip the separator for arguments from config file and command
+ * line
+ */
+ if (argv[i] == args_separator)
+ continue;
for (size_t j = 0; f_options[j].name; j++)
{
const char * name = f_options[j].name;
Attachment: [text/bzr-bundle] bzr/zhenxing.he@sun.com-20090421094813-2pwt8t98nnky0f56.bundle
| Thread |
|---|
| • bzr push into mysql-6.0-rpl branch (zhenxing.he:2844 to 2847) | He Zhenxing | 21 Apr |
