#At file:///Users/malff/BZR_TREE/mysql-trunk-wl4813/ based on revid:marc.alff@stripped
3213 Marc Alff 2011-02-25 [merge]
Merge mysql-trunk --> mysql-trunk-wl4813
removed:
mysql-test/r/crash_commit_before.result
mysql-test/t/crash_commit_before-master.opt
mysql-test/t/crash_commit_before.test
mysql-test/t/partition-master.opt
added:
mysql-test/include/check_qep.inc
mysql-test/include/expect_qep.inc
mysql-test/r/multi_update_innodb.result
mysql-test/r/partition_explicit_prune.result
mysql-test/suite/binlog/r/rpl_crash_safe_master_checksum.result
mysql-test/suite/binlog/t/rpl_crash_safe_master_checksum-master.opt
mysql-test/suite/binlog/t/rpl_crash_safe_master_checksum.test
mysql-test/suite/parts/inc/partition-dml-1-1-modes.inc
mysql-test/suite/parts/inc/partition-dml-1-1.inc
mysql-test/suite/parts/inc/partition-dml-1-10.inc
mysql-test/suite/parts/inc/partition-dml-1-11.inc
mysql-test/suite/parts/inc/partition-dml-1-2.inc
mysql-test/suite/parts/inc/partition-dml-1-3.inc
mysql-test/suite/parts/inc/partition-dml-1-4.inc
mysql-test/suite/parts/inc/partition-dml-1-5.inc
mysql-test/suite/parts/inc/partition-dml-1-6.inc
mysql-test/suite/parts/inc/partition-dml-1-7.inc
mysql-test/suite/parts/inc/partition-dml-1-8.inc
mysql-test/suite/parts/inc/partition-dml-1-9.inc
mysql-test/suite/parts/inc/partition-dml_cr_tab.inc
mysql-test/suite/parts/inc/partition-dml_ins_tab.inc
mysql-test/suite/parts/inc/rpl-partition-dml-1-1.inc
mysql-test/suite/parts/r/partition-dml-1-1-innodb-modes.result
mysql-test/suite/parts/r/partition-dml-1-1-innodb.result
mysql-test/suite/parts/r/partition-dml-1-1-myisam-modes.result
mysql-test/suite/parts/r/partition-dml-1-1-myisam.result
mysql-test/suite/parts/r/partition-dml-1-10-innodb.result
mysql-test/suite/parts/r/partition-dml-1-10-myisam.result
mysql-test/suite/parts/r/partition-dml-1-11-innodb.result
mysql-test/suite/parts/r/partition-dml-1-11-myisam.result
mysql-test/suite/parts/r/partition-dml-1-2-innodb.result
mysql-test/suite/parts/r/partition-dml-1-2-myisam.result
mysql-test/suite/parts/r/partition-dml-1-3-innodb.result
mysql-test/suite/parts/r/partition-dml-1-4-innodb.result
mysql-test/suite/parts/r/partition-dml-1-5-innodb.result
mysql-test/suite/parts/r/partition-dml-1-6-innodb.result
mysql-test/suite/parts/r/partition-dml-1-7-innodb.result
mysql-test/suite/parts/r/partition-dml-1-8-innodb.result
mysql-test/suite/parts/r/partition-dml-1-9-innodb.result
mysql-test/suite/parts/r/partition-dml-1-9-myisam.result
mysql-test/suite/parts/r/rpl-partition-dml-1-1-innodb.result
mysql-test/suite/parts/r/rpl-partition-dml-1-1-myisam.result
mysql-test/suite/parts/t/partition-dml-1-1-innodb-modes.test
mysql-test/suite/parts/t/partition-dml-1-1-innodb.test
mysql-test/suite/parts/t/partition-dml-1-1-myisam-modes.test
mysql-test/suite/parts/t/partition-dml-1-1-myisam.test
mysql-test/suite/parts/t/partition-dml-1-10-innodb.test
mysql-test/suite/parts/t/partition-dml-1-10-myisam.test
mysql-test/suite/parts/t/partition-dml-1-11-innodb.test
mysql-test/suite/parts/t/partition-dml-1-11-myisam.test
mysql-test/suite/parts/t/partition-dml-1-2-innodb.test
mysql-test/suite/parts/t/partition-dml-1-2-myisam.test
mysql-test/suite/parts/t/partition-dml-1-3-innodb.test
mysql-test/suite/parts/t/partition-dml-1-4-innodb.test
mysql-test/suite/parts/t/partition-dml-1-5-innodb.test
mysql-test/suite/parts/t/partition-dml-1-6-innodb.test
mysql-test/suite/parts/t/partition-dml-1-7-innodb.test
mysql-test/suite/parts/t/partition-dml-1-8-innodb.test
mysql-test/suite/parts/t/partition-dml-1-9-innodb.test
mysql-test/suite/parts/t/partition-dml-1-9-myisam.test
mysql-test/suite/parts/t/rpl-partition-dml-1-1-innodb.test
mysql-test/suite/parts/t/rpl-partition-dml-1-1-myisam.test
mysql-test/suite/rpl/r/rpl_crash_safe_master.result
mysql-test/suite/rpl/t/rpl_crash_safe_master.test
mysql-test/suite/sys_vars/r/core_file_basic.result
mysql-test/suite/sys_vars/t/core_file_basic-master.opt
mysql-test/suite/sys_vars/t/core_file_basic.test
mysql-test/t/multi_update_innodb.test
mysql-test/t/partition_explicit_prune.test
modified:
client/mysql.cc
client/mysqldump.c
client/mysqltest.cc
include/my_base.h
include/my_global.h
include/my_sys.h
include/mysql_embed.h
include/welcome_copyright_notice.h
mysql-test/include/mysqld--help.inc
mysql-test/include/subquery_sj.inc
mysql-test/include/unsafe_binlog.inc
mysql-test/r/alter_table.result
mysql-test/r/create.result
mysql-test/r/ctype_ldml.result
mysql-test/r/ddl_i18n_koi8r.result
mysql-test/r/ddl_i18n_utf8.result
mysql-test/r/func_rollback.result
mysql-test/r/func_time.result
mysql-test/r/greedy_optimizer.result
mysql-test/r/join.result
mysql-test/r/join_cache_jcl1.result
mysql-test/r/join_cache_jcl2.result
mysql-test/r/join_cache_jcl3.result
mysql-test/r/join_cache_jcl4.result
mysql-test/r/lock.result
mysql-test/r/log_state.result
mysql-test/r/log_tables.result
mysql-test/r/mdl_sync.result
mysql-test/r/multi_update.result
mysql-test/r/mysqld--help-notwin.result
mysql-test/r/mysqld--help-win.result
mysql-test/r/mysqldump.result
mysql-test/r/negation_elimination.result
mysql-test/r/partition.result
mysql-test/r/partition_exchange.result
mysql-test/r/status.result
mysql-test/r/subquery_sj_none.result
mysql-test/r/system_mysql_db.result
mysql-test/r/unsafe_binlog_innodb.result
mysql-test/std_data/Index.xml
mysql-test/suite/binlog/r/binlog_index.result
mysql-test/suite/binlog/t/binlog_delete_and_flush_index.test
mysql-test/suite/binlog/t/binlog_index.test
mysql-test/suite/funcs_1/r/is_columns_mysql.result
mysql-test/suite/innodb/r/innodb.result
mysql-test/suite/innodb/t/innodb.test
mysql-test/suite/parts/inc/partition_fail.inc
mysql-test/suite/parts/r/partition_exch_qa_13.result
mysql-test/suite/parts/r/partition_exch_qa_2.result
mysql-test/suite/parts/r/partition_mgm_lc0_archive.result
mysql-test/suite/parts/r/partition_mgm_lc0_innodb.result
mysql-test/suite/parts/r/partition_mgm_lc0_memory.result
mysql-test/suite/parts/r/partition_mgm_lc0_myisam.result
mysql-test/suite/parts/r/partition_mgm_lc1_archive.result
mysql-test/suite/parts/r/partition_mgm_lc1_innodb.result
mysql-test/suite/parts/r/partition_mgm_lc1_memory.result
mysql-test/suite/parts/r/partition_mgm_lc1_myisam.result
mysql-test/suite/parts/r/partition_mgm_lc2_archive.result
mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result
mysql-test/suite/parts/r/partition_mgm_lc2_memory.result
mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result
mysql-test/suite/parts/r/partition_repair_myisam.result
mysql-test/suite/parts/t/partition_debug_myisam.test
mysql-test/suite/parts/t/partition_exch_qa_14.test
mysql-test/suite/parts/t/partition_repair_myisam.test
mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result
mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result
mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result
mysql-test/suite/rpl/r/rpl_checksum.result
mysql-test/suite/rpl/r/rpl_corruption.result
mysql-test/suite/rpl/r/rpl_manual_change_index_file.result
mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result
mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result
mysql-test/suite/rpl/r/rpl_stm_000001.result
mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result
mysql-test/suite/rpl/t/rpl_checksum.test
mysql-test/suite/rpl/t/rpl_corruption.test
mysql-test/suite/rpl/t/rpl_manual_change_index_file.test
mysql-test/suite/rpl/t/rpl_stm_000001.test
mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result
mysql-test/suite/sys_vars/r/slow_query_log_func.result
mysql-test/suite/sys_vars/t/slow_query_log_func.test
mysql-test/t/alter_table.test
mysql-test/t/create.test
mysql-test/t/ctype_ldml.test
mysql-test/t/func_rollback.test
mysql-test/t/func_time.test
mysql-test/t/grant.test
mysql-test/t/greedy_optimizer.test
mysql-test/t/lock.test
mysql-test/t/log_state.test
mysql-test/t/log_tables.test
mysql-test/t/mdl_sync.test
mysql-test/t/multi_update.test
mysql-test/t/mysql.test
mysql-test/t/mysql_cp932.test
mysql-test/t/mysqlbinlog-cp932.test
mysql-test/t/mysqldump.test
mysql-test/t/negation_elimination.test
mysql-test/t/partition.test
mysql-test/t/partition_binlog.test
mysys/hash.c
mysys/my_conio.c
mysys/my_handler.c
mysys/my_handler_errors.h
mysys/my_rename.c
scripts/mysql_system_tables.sql
scripts/mysql_system_tables_fix.sql
scripts/mysqldumpslow.sh
sql-common/client.c
sql/binlog.cc
sql/binlog.h
sql/ha_ndbcluster_cond.cc
sql/ha_partition.cc
sql/ha_partition.h
sql/handler.cc
sql/handler.h
sql/item_cmpfunc.cc
sql/item_cmpfunc.h
sql/item_func.h
sql/item_timefunc.cc
sql/item_timefunc.h
sql/log.cc
sql/log.h
sql/log_event.cc
sql/mysqld.cc
sql/mysqld.h
sql/opt_range.cc
sql/partition_info.cc
sql/partition_info.h
sql/share/errmsg-utf8.txt
sql/sql_base.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_parse.cc
sql/sql_partition.cc
sql/sql_plugin.cc
sql/sql_plugin.h
sql/sql_select.cc
sql/sql_table.cc
sql/sql_table.h
sql/sql_update.cc
sql/sql_yacc.yy
sql/sys_vars.cc
sql/sys_vars.h
sql/table.cc
sql/table.h
storage/innobase/btr/btr0sea.c
storage/innobase/include/ha0ha.h
strings/ctype-uca.c
strings/ctype.c
unittest/gunit/item-t.cc
Diff too large for email (24349 lines, the limit is 10000).
No bundle (reason: revision is a merge).
| Thread |
|---|
| • bzr commit into mysql-trunk branch (marc.alff:3213) | Marc Alff | 25 Feb |
