#At file:///home/bm136801/my/upd-51/ based on revid:bjorn.munch@stripped
2961 Bjorn Munch 2010-12-20 [merge]
new merge from 5.1
removed:
EXCEPTIONS-CLIENT
mysql-test/suite/ibmdb2i/
mysql-test/suite/ibmdb2i/include/
mysql-test/suite/ibmdb2i/include/have_i54.inc
mysql-test/suite/ibmdb2i/include/have_i61.inc
mysql-test/suite/ibmdb2i/include/have_ibmdb2i.inc
mysql-test/suite/ibmdb2i/r/
mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44020.result
mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44025.result
mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44232.result
mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44610.result
mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45196.result
mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45793.result
mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45983.result
mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_49329.result
mysql-test/suite/ibmdb2i/r/ibmdb2i_collations.result
mysql-test/suite/ibmdb2i/t/
mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44020.test
mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44025.test
mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44232.test
mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44610.test
mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45196.test
mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45793.test
mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45983.test
mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_49329.test
mysql-test/suite/ibmdb2i/t/ibmdb2i_collations.test
mysql-test/suite/innodb_plugin/r/innodb_bug54679.result
mysql-test/suite/innodb_plugin/t/innodb_bug54679.test
mysql-test/suite/rpl/t/rpl_binlog_max_cache_size-master.opt
mysql-test/suite/sys_vars/README
pstack/
pstack/Makefile.am
pstack/aout/
pstack/aout/Makefile.am
pstack/aout/aout64.h
pstack/aout/stab.def
pstack/aout/stab_gnu.h
pstack/bucomm.c
pstack/bucomm.h
pstack/budbg.h
pstack/debug.c
pstack/debug.h
pstack/demangle.h
pstack/filemode.c
pstack/ieee.c
pstack/ieee.h
pstack/libiberty.h
pstack/linuxthreads.c
pstack/linuxthreads.h
pstack/pstack.c
pstack/pstack.h
pstack/pstacktrace.h
pstack/rddbg.c
pstack/stabs.c
storage/ibmdb2i/
storage/ibmdb2i/CMakeLists.txt
storage/ibmdb2i/Makefile.am
storage/ibmdb2i/db2i_blobCollection.cc
storage/ibmdb2i/db2i_blobCollection.h
storage/ibmdb2i/db2i_charsetSupport.cc
storage/ibmdb2i/db2i_charsetSupport.h
storage/ibmdb2i/db2i_collationSupport.cc
storage/ibmdb2i/db2i_collationSupport.h
storage/ibmdb2i/db2i_constraints.cc
storage/ibmdb2i/db2i_conversion.cc
storage/ibmdb2i/db2i_errors.cc
storage/ibmdb2i/db2i_errors.h
storage/ibmdb2i/db2i_file.cc
storage/ibmdb2i/db2i_file.h
storage/ibmdb2i/db2i_global.h
storage/ibmdb2i/db2i_iconv.h
storage/ibmdb2i/db2i_ileBridge.cc
storage/ibmdb2i/db2i_ileBridge.h
storage/ibmdb2i/db2i_ioBuffers.cc
storage/ibmdb2i/db2i_ioBuffers.h
storage/ibmdb2i/db2i_misc.h
storage/ibmdb2i/db2i_myconv.cc
storage/ibmdb2i/db2i_myconv.h
storage/ibmdb2i/db2i_rir.cc
storage/ibmdb2i/db2i_safeString.h
storage/ibmdb2i/db2i_sqlStatementStream.cc
storage/ibmdb2i/db2i_sqlStatementStream.h
storage/ibmdb2i/db2i_validatedPointer.h
storage/ibmdb2i/ha_ibmdb2i.cc
storage/ibmdb2i/ha_ibmdb2i.h
storage/ibmdb2i/plug.in
added:
mysql-test/collections/mysql-5.1-bugteam.daily
mysql-test/collections/mysql-5.1-bugteam.push
mysql-test/extra/rpl_tests/rpl_stop_slave.test
mysql-test/include/ctype_8bit.inc
mysql-test/include/io_thd_fault_injection.inc
mysql-test/r/lowercase_table4.result
mysql-test/suite/federated/federated_bug_35333.result
mysql-test/suite/federated/federated_bug_35333.test
mysql-test/suite/innodb/r/innodb_bug56143.result
mysql-test/suite/innodb/r/innodb_bug56680.result
mysql-test/suite/innodb/r/innodb_bug57252.result
mysql-test/suite/innodb/t/innodb_bug56143.test
mysql-test/suite/innodb/t/innodb_bug56680.test
mysql-test/suite/innodb/t/innodb_bug57252.test
mysql-test/suite/innodb_plugin/r/innodb-create-options.result
mysql-test/suite/innodb_plugin/r/innodb_bug53046.result
mysql-test/suite/innodb_plugin/r/innodb_bug56143.result
mysql-test/suite/innodb_plugin/r/innodb_bug56680.result
mysql-test/suite/innodb_plugin/r/innodb_bug56947.result
mysql-test/suite/innodb_plugin/r/innodb_bug57252.result
mysql-test/suite/innodb_plugin/t/innodb-create-options.test
mysql-test/suite/innodb_plugin/t/innodb_bug53046.test
mysql-test/suite/innodb_plugin/t/innodb_bug56143.test
mysql-test/suite/innodb_plugin/t/innodb_bug56680.test
mysql-test/suite/innodb_plugin/t/innodb_bug56947.test
mysql-test/suite/innodb_plugin/t/innodb_bug57252.test
mysql-test/suite/rpl/r/rpl_binlog_errors.result
mysql-test/suite/rpl/r/rpl_stop_slave.result
mysql-test/suite/rpl/t/rpl_binlog_errors-master.opt
mysql-test/suite/rpl/t/rpl_binlog_errors.test
mysql-test/suite/rpl/t/rpl_stop_slave.test
mysql-test/suite/sys_vars/t/disabled.def
mysql-test/suite/sys_vars/t/innodb_commit_concurrency_basic-master.opt
mysql-test/suite/sys_vars/t/myisam_data_pointer_size_func-master.opt
mysql-test/suite/sys_vars/t/sql_log_off_func-master.opt
mysql-test/t/lowercase_table4-master.opt
mysql-test/t/lowercase_table4.test
modified:
.bzr-mysql/default.conf
.bzrignore
BUILD/SETUP.sh
BUILD/compile-pentium-mysqlfs-debug
CMakeLists.txt
Makefile.am
README
client/mysql.cc
client/mysqltest.cc
client/sql_string.h
cmd-line-utils/libedit/common.c
cmd-line-utils/libedit/filecomplete.c
cmd-line-utils/libedit/readline.c
cmd-line-utils/libedit/vi.c
cmd-line-utils/readline/bind.c
cmd-line-utils/readline/complete.c
cmd-line-utils/readline/histexpand.c
cmd-line-utils/readline/histfile.c
cmd-line-utils/readline/isearch.c
cmd-line-utils/readline/parens.c
cmd-line-utils/readline/readline.c
cmd-line-utils/readline/terminal.c
cmd-line-utils/readline/text.c
config/ac-macros/maintainer.m4
configure.in
dbug/dbug.c
include/config-netware.h
include/config-win.h
include/m_ctype.h
include/m_string.h
include/my_compiler.h
include/my_dbug.h
include/my_global.h
include/my_pthread.h
include/my_stacktrace.h
include/mysql_embed.h
include/mysys_err.h
libmysql/Makefile.am
libmysql/Makefile.shared
libmysql/conf_to_src.c
libmysql/dll.c
libmysql/errmsg.c
libmysql/get_password.c
libmysql/libmysql.c
libmysql/manager.c
libmysql_r/Makefile.am
mysql-test/collections/default.experimental
mysql-test/collections/default.weekly
mysql-test/extra/binlog_tests/binlog.test
mysql-test/extra/binlog_tests/binlog_failure_mixing_engines.test
mysql-test/include/index_merge2.inc
mysql-test/include/restart_mysqld.inc
mysql-test/r/auto_increment.result
mysql-test/r/change_user.result
mysql-test/r/connect.result
mysql-test/r/ctype_cp1251.result
mysql-test/r/ctype_latin1.result
mysql-test/r/ctype_ujis.result
mysql-test/r/ctype_utf8.result
mysql-test/r/date_formats.result
mysql-test/r/derived.result
mysql-test/r/explain.result
mysql-test/r/fulltext.result
mysql-test/r/func_gconcat.result
mysql-test/r/func_math.result
mysql-test/r/func_misc.result
mysql-test/r/func_str.result
mysql-test/r/func_time.result
mysql-test/r/grant.result
mysql-test/r/grant3.result
mysql-test/r/group_by.result
mysql-test/r/index_merge_innodb.result
mysql-test/r/index_merge_myisam.result
mysql-test/r/join_outer.result
mysql-test/r/key_cache.result
mysql-test/r/log_tables.result
mysql-test/r/merge.result
mysql-test/r/multi_update.result
mysql-test/r/mysql.result
mysql-test/r/mysqltest.result
mysql-test/r/partition_innodb.result
mysql-test/r/partition_innodb_plugin.result
mysql-test/r/plugin_not_embedded.result
mysql-test/r/show_check.result
mysql-test/r/sp-bugs.result
mysql-test/r/type_blob.result
mysql-test/r/user_var.result
mysql-test/r/variables-big.result
mysql-test/r/variables.result
mysql-test/r/view.result
mysql-test/r/xml.result
mysql-test/suite/binlog/r/binlog_index.result
mysql-test/suite/binlog/r/binlog_mixed_failure_mixing_engines.result
mysql-test/suite/binlog/r/binlog_row_binlog.result
mysql-test/suite/binlog/r/binlog_row_failure_mixing_engines.result
mysql-test/suite/binlog/r/binlog_stm_binlog.result
mysql-test/suite/binlog/r/binlog_unsafe.result
mysql-test/suite/binlog/t/binlog_index.test
mysql-test/suite/binlog/t/disabled.def
mysql-test/suite/innodb/r/innodb-autoinc.result
mysql-test/suite/innodb/r/innodb_multi_update.result
mysql-test/suite/innodb/r/innodb_mysql.result
mysql-test/suite/innodb/t/innodb-autoinc.test
mysql-test/suite/innodb/t/innodb_multi_update.test
mysql-test/suite/innodb/t/innodb_mysql.test
mysql-test/suite/innodb_plugin/r/innodb-autoinc.result
mysql-test/suite/innodb_plugin/r/innodb-zip.result
mysql-test/suite/innodb_plugin/r/innodb_multi_update.result
mysql-test/suite/innodb_plugin/r/innodb_mysql.result
mysql-test/suite/innodb_plugin/t/innodb-autoinc.test
mysql-test/suite/innodb_plugin/t/innodb-zip.test
mysql-test/suite/innodb_plugin/t/innodb_multi_update.test
mysql-test/suite/innodb_plugin/t/innodb_mysql.test
mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc
mysql-test/suite/parts/inc/partition_auto_increment.inc
mysql-test/suite/parts/inc/partition_decimal.inc
mysql-test/suite/parts/inc/partition_double.inc
mysql-test/suite/parts/inc/partition_float.inc
mysql-test/suite/parts/r/partition_auto_increment_blackhole.result
mysql-test/suite/parts/r/partition_auto_increment_innodb.result
mysql-test/suite/parts/r/partition_auto_increment_memory.result
mysql-test/suite/parts/r/partition_auto_increment_myisam.result
mysql-test/suite/parts/r/partition_decimal_innodb.result
mysql-test/suite/parts/r/partition_decimal_myisam.result
mysql-test/suite/parts/t/part_supported_sql_func_innodb.test
mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test
mysql-test/suite/parts/t/partition_alter1_2_innodb.test
mysql-test/suite/parts/t/partition_alter4_innodb.test
mysql-test/suite/rpl/r/rpl_alter.result
mysql-test/suite/rpl/r/rpl_binlog_max_cache_size.result
mysql-test/suite/rpl/r/rpl_do_grant.result
mysql-test/suite/rpl/r/rpl_stm_EE_err2.result
mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result
mysql-test/suite/rpl/t/rpl_alter.test
mysql-test/suite/rpl/t/rpl_binlog_max_cache_size.test
mysql-test/suite/rpl/t/rpl_do_grant.test
mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test
mysql-test/suite/sys_vars/inc/timestamp_basic.inc
mysql-test/suite/sys_vars/r/general_log_file_basic.result
mysql-test/suite/sys_vars/r/general_log_func.result
mysql-test/suite/sys_vars/r/innodb_commit_concurrency_basic.result
mysql-test/suite/sys_vars/r/log_output_basic.result
mysql-test/suite/sys_vars/r/log_output_func.result
mysql-test/suite/sys_vars/r/slow_query_log_file_basic.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.result
mysql-test/suite/sys_vars/t/completion_type_func.test
mysql-test/suite/sys_vars/t/general_log_file_basic.test
mysql-test/suite/sys_vars/t/general_log_func.test
mysql-test/suite/sys_vars/t/innodb_commit_concurrency_basic.test
mysql-test/suite/sys_vars/t/log_output_func.test
mysql-test/suite/sys_vars/t/myisam_data_pointer_size_func.test
mysql-test/suite/sys_vars/t/rpl_init_slave_func.test
mysql-test/suite/sys_vars/t/slow_query_log_file_basic.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.test
mysql-test/t/auto_increment.test
mysql-test/t/change_user.test
mysql-test/t/connect.test
mysql-test/t/ctype_cp1251.test
mysql-test/t/ctype_latin1.test
mysql-test/t/ctype_ujis.test
mysql-test/t/ctype_utf8.test
mysql-test/t/date_formats.test
mysql-test/t/derived.test
mysql-test/t/disabled.def
mysql-test/t/explain.test
mysql-test/t/fulltext.test
mysql-test/t/func_gconcat.test
mysql-test/t/func_math.test
mysql-test/t/func_misc.test
mysql-test/t/func_str.test
mysql-test/t/func_time.test
mysql-test/t/grant.test
mysql-test/t/grant3.test
mysql-test/t/group_by.test
mysql-test/t/join_outer.test
mysql-test/t/key_cache.test
mysql-test/t/log_tables.test
mysql-test/t/multi_update.test
mysql-test/t/mysql.test
mysql-test/t/mysqltest.test
mysql-test/t/partition_innodb.test
mysql-test/t/partition_innodb_plugin.test
mysql-test/t/plugin_not_embedded.test
mysql-test/t/sp-bugs.test
mysql-test/t/type_blob.test
mysql-test/t/user_var.test
mysql-test/t/variables-big.test
mysql-test/t/variables.test
mysql-test/t/view.test
mysql-test/t/xml.test
mysys/errors.c
mysys/mf_keycache.c
mysys/my_gethostbyname.c
mysys/my_gethwaddr.c
mysys/my_getncpus.c
mysys/my_seek.c
mysys/my_symlink.c
mysys/my_sync.c
mysys/stacktrace.c
mysys/thr_mutex.c
regex/main.c
regex/regexec.c
scripts/make_binary_distribution.sh
scripts/make_win_bin_dist
sql/Makefile.am
sql/debug_sync.cc
sql/field_conv.cc
sql/ha_ndbcluster.cc
sql/ha_partition.cc
sql/handler.cc
sql/item.cc
sql/item_cmpfunc.cc
sql/item_func.cc
sql/item_func.h
sql/item_row.cc
sql/item_strfunc.cc
sql/item_subselect.cc
sql/item_subselect.h
sql/item_sum.cc
sql/item_timefunc.cc
sql/item_timefunc.h
sql/item_xmlfunc.cc
sql/lock.cc
sql/log.cc
sql/log.h
sql/log_event.cc
sql/log_event.h
sql/my_decimal.cc
sql/my_decimal.h
sql/mysql_priv.h
sql/mysqld.cc
sql/opt_range.h
sql/records.cc
sql/rpl_injector.cc
sql/rpl_rli.h
sql/set_var.cc
sql/set_var.h
sql/share/charsets/cp1251.xml
sql/slave.cc
sql/slave.h
sql/sp_head.cc
sql/sql_acl.cc
sql/sql_base.cc
sql/sql_binlog.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_connect.cc
sql/sql_db.cc
sql/sql_derived.cc
sql/sql_help.cc
sql/sql_insert.cc
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_load.cc
sql/sql_parse.cc
sql/sql_partition.cc
sql/sql_plugin.cc
sql/sql_plugin.h
sql/sql_prepare.cc
sql/sql_rename.cc
sql/sql_select.cc
sql/sql_show.cc
sql/sql_string.h
sql/sql_table.cc
sql/sql_udf.cc
sql/sql_union.cc
sql/sql_update.cc
sql/sql_view.cc
sql/sql_yacc.yy
storage/innobase/buf/buf0buf.c
storage/innobase/buf/buf0flu.c
storage/innobase/buf/buf0lru.c
storage/innobase/dict/dict0load.c
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innobase/ibuf/ibuf0ibuf.c
storage/innobase/include/buf0flu.h
storage/innobase/include/buf0lru.h
storage/innobase/include/ibuf0ibuf.h
storage/innobase/include/rem0rec.h
storage/innobase/include/rem0rec.ic
storage/innobase/include/row0mysql.h
storage/innobase/include/row0upd.h
storage/innobase/include/ut0dbg.h
storage/innobase/os/os0file.c
storage/innobase/row/row0mysql.c
storage/innobase/row/row0sel.c
storage/innobase/row/row0upd.c
storage/innobase/srv/srv0start.c
storage/innobase/sync/sync0rw.c
storage/innobase/trx/trx0undo.c
storage/innodb_plugin/ChangeLog
storage/innodb_plugin/btr/btr0cur.c
storage/innodb_plugin/buf/buf0buf.c
storage/innodb_plugin/buf/buf0flu.c
storage/innodb_plugin/dict/dict0crea.c
storage/innodb_plugin/dict/dict0dict.c
storage/innodb_plugin/dict/dict0load.c
storage/innodb_plugin/fil/fil0fil.c
storage/innodb_plugin/fsp/fsp0fsp.c
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.h
storage/innodb_plugin/handler/handler0alter.cc
storage/innodb_plugin/ibuf/ibuf0ibuf.c
storage/innodb_plugin/include/btr0btr.h
storage/innodb_plugin/include/btr0btr.ic
storage/innodb_plugin/include/btr0cur.h
storage/innodb_plugin/include/buf0flu.h
storage/innodb_plugin/include/dict0dict.h
storage/innodb_plugin/include/fil0fil.h
storage/innodb_plugin/include/ibuf0ibuf.h
storage/innodb_plugin/include/row0ins.h
storage/innodb_plugin/include/row0mysql.h
storage/innodb_plugin/include/row0upd.h
storage/innodb_plugin/include/univ.i
storage/innodb_plugin/os/os0file.c
storage/innodb_plugin/plug.in
storage/innodb_plugin/row/row0ins.c
storage/innodb_plugin/row/row0merge.c
storage/innodb_plugin/row/row0mysql.c
storage/innodb_plugin/row/row0sel.c
storage/innodb_plugin/row/row0upd.c
storage/innodb_plugin/srv/srv0start.c
storage/innodb_plugin/sync/sync0rw.c
storage/innodb_plugin/thr/thr0loc.c
storage/innodb_plugin/trx/trx0i_s.c
storage/innodb_plugin/trx/trx0undo.c
storage/myisam/ft_nlq_search.c
storage/myisam/ha_myisam.cc
storage/myisam/mi_check.c
storage/myisam/mi_create.c
storage/myisam/myisamchk.c
storage/myisammrg/ha_myisammrg.cc
storage/myisammrg/myrg_open.c
strings/CHARSET_INFO.txt
strings/ctype-extra.c
strings/my_strchr.c
support-files/my-huge.cnf.sh
support-files/my-innodb-heavy-4G.cnf.sh
support-files/my-large.cnf.sh
support-files/my-medium.cnf.sh
support-files/my-small.cnf.sh
support-files/mysql.spec.sh
tests/mysql_client_test.c
unittest/examples/skip-t.c
unittest/examples/skip_all-t.c
unittest/examples/todo-t.c
unittest/mytap/t/basic-t.c
unittest/mytap/tap.c
unittest/mytap/tap.h
win/configure.js
Diff too large for email (68527 lines, the limit is 10000).
No bundle (reason: revision is a merge).
| Thread |
|---|
| • bzr commit into mysql-5.1 branch (bjorn.munch:2961) | Bjorn Munch | 20 Dec |
