3076 Bjorn Munch 2011-05-12 [merge]
null upmerge
3075 Bjorn Munch 2011-05-12 [merge]
merge from trunk
removed:
include/probes_mysql_nodtrace.h
added:
libmysql/authentication_win/
libmysql/authentication_win/CMakeLists.txt
libmysql/authentication_win/common.cc
libmysql/authentication_win/common.h
libmysql/authentication_win/handshake.cc
libmysql/authentication_win/handshake.h
libmysql/authentication_win/handshake_client.cc
libmysql/authentication_win/log_client.cc
libmysql/authentication_win/plugin_client.cc
mysql-test/collections/mysql-trunk-bug27480.push
mysql-test/include/ipv6_func.inc
mysql-test/include/start_slave_io.inc
mysql-test/include/start_slave_sql.inc
modified:
.bzrignore
BUILD/SETUP.sh
client/mysql.cc*
client/mysqlbinlog.cc
client/mysqltest.cc
cmake/os/WindowsCache.cmake
cmd-line-utils/libedit/el.c
config.h.cmake
configure.cmake
extra/replace.c
include/mysql.h
include/mysql.h.pp
libmysql/CMakeLists.txt
libmysql/libmysql.c
mysql-test/collections/default.experimental
mysql-test/extra/rpl_tests/check_type.inc
mysql-test/include/handler.inc
mysql-test/include/ipv6.inc
mysql-test/include/wait_show_condition.inc
mysql-test/r/alter_table.result
mysql-test/r/ctype_binary.result
mysql-test/r/ctype_cp1251.result
mysql-test/r/ctype_latin1.result
mysql-test/r/ctype_ucs.result
mysql-test/r/ctype_utf8.result
mysql-test/r/distinct.result
mysql-test/r/events_1.result
mysql-test/r/events_restart.result
mysql-test/r/explain.result
mysql-test/r/flush_read_lock.result
mysql-test/r/func_misc.result
mysql-test/r/grant2.result
mysql-test/r/grant4.result
mysql-test/r/handler_innodb.result
mysql-test/r/handler_myisam.result
mysql-test/r/innodb_mysql_lock.result
mysql-test/r/ipv4_as_ipv6.result
mysql-test/r/ipv6.result
mysql-test/r/merge.result
mysql-test/r/metadata.result
mysql-test/r/mysqlbinlog_base64.result
mysql-test/r/mysqldump.result
mysql-test/r/ps_ddl.result
mysql-test/r/temp_table.result
mysql-test/r/trigger.result
mysql-test/r/type_newdecimal.result
mysql-test/r/type_ranges.result
mysql-test/r/variables-big.result
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
mysql-test/suite/binlog/t/binlog_bug23533.test
mysql-test/suite/funcs_1/r/is_columns_mysql.result
mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
mysql-test/suite/innodb/r/innodb_mysql.result
mysql-test/suite/innodb/t/innodb_mysql.test
mysql-test/suite/rpl/r/rpl_crash_safe_master.result
mysql-test/suite/rpl/r/rpl_create_if_not_exists.result
mysql-test/suite/rpl/r/rpl_loaddatalocal.result
mysql-test/suite/rpl/r/rpl_row_crash_safe.result
mysql-test/suite/rpl/r/rpl_row_ignorable_event.result
mysql-test/suite/rpl/r/rpl_server_id2.result
mysql-test/suite/rpl/r/rpl_show_slave_hosts.result
mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result
mysql-test/suite/rpl/r/rpl_typeconv.result
mysql-test/suite/rpl/t/rpl_crash_safe_master.test
mysql-test/suite/rpl/t/rpl_create_if_not_exists.test
mysql-test/suite/rpl/t/rpl_loaddatalocal.test
mysql-test/suite/rpl/t/rpl_row_ignorable_event.test
mysql-test/suite/rpl/t/rpl_row_until.test
mysql-test/suite/rpl/t/rpl_server_id2.test
mysql-test/suite/rpl/t/rpl_show_slave_hosts.test
mysql-test/suite/rpl/t/rpl_typeconv.test
mysql-test/t/alter_table.test
mysql-test/t/distinct.test
mysql-test/t/events_1.test
mysql-test/t/events_restart.test
mysql-test/t/explain.test
mysql-test/t/flush_read_lock.test
mysql-test/t/func_misc.test
mysql-test/t/grant2.test
mysql-test/t/grant4.test
mysql-test/t/handler_myisam.test
mysql-test/t/innodb_mysql_lock.test
mysql-test/t/ipv4_as_ipv6.test
mysql-test/t/ipv6.test
mysql-test/t/merge.test
mysql-test/t/mysqlbinlog_base64.test
mysql-test/t/mysqlbinlog_raw_mode.test
mysql-test/t/mysqldump.test
mysql-test/t/ps_ddl.test
mysql-test/t/temp_table.test
mysql-test/t/trigger.test
mysql-test/t/type_newdecimal.test
mysql-test/t/variables-big.test
scripts/make_win_bin_dist
scripts/mysql_system_tables.sql
sql-common/client.c
sql/event_db_repository.cc
sql/field.cc
sql/handler.h
sql/item.cc
sql/item_cmpfunc.cc
sql/item_create.cc
sql/item_func.cc
sql/item_inetfunc.cc
sql/item_inetfunc.h
sql/item_row.cc
sql/item_strfunc.cc
sql/log_event.cc
sql/my_decimal.cc
sql/my_decimal.h
sql/opt_range.cc
sql/protocol.cc
sql/rpl_slave.cc
sql/sp_head.cc
sql/sql_acl.cc
sql/sql_acl.h
sql/sql_admin.cc
sql/sql_alter.cc
sql/sql_analyse.cc
sql/sql_base.cc
sql/sql_base.h
sql/sql_class.h
sql/sql_db.cc
sql/sql_handler.cc
sql/sql_handler.h
sql/sql_insert.cc
sql/sql_lex.h
sql/sql_load.cc
sql/sql_parse.cc
sql/sql_parse.h
sql/sql_partition.cc
sql/sql_partition_admin.cc
sql/sql_prepare.cc
sql/sql_rename.cc
sql/sql_select.cc
sql/sql_select.h
sql/sql_show.cc
sql/sql_table.cc
sql/sql_truncate.cc
sql/sql_view.cc
sql/sql_yacc.yy
sql/table.cc
sql/table.h
storage/archive/ha_archive.cc
storage/innobase/include/trx0purge.h
storage/innobase/include/trx0rec.h
storage/innobase/trx/trx0purge.c
storage/innobase/trx/trx0rec.c
storage/myisammrg/ha_myisammrg.cc
storage/ndb/src/kernel/blocks/lgman.cpp
strings/decimal.c
vio/viosocket.c
3074 Bjorn Munch 2011-05-09 [merge]
upmerge 5680
added:
mysql-test/lib/mtr_results.pm
modified:
mysql-test/lib/My/CoreDump.pm
mysql-test/lib/My/Test.pm
mysql-test/lib/mtr_report.pm
mysql-test/mysql-test-run.pl
Diff too large for email (15274 lines, the limit is 10000).
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk-mtr branch (bjorn.munch:3074 to 3076) | Bjorn Munch | 12 May |
