#At file:///home/malff/BZR_TREE/mysql-trunk-wl5378/ based on revid:marc.alff@stripped
3356 Marc Alff 2011-06-03 [merge]
Merge mysql-trunk --> mysql-trunk-wl5378
added:
extra/yassl/include/openssl/transport_types.h
mysql-test/suite/binlog/r/binlog_reset_master.result
mysql-test/suite/binlog/t/binlog_reset_master.test
mysql-test/suite/innodb/r/innodb_index_large_prefix.result
mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result
mysql-test/suite/innodb/r/innodb_prefix_index_restart_server.result
mysql-test/suite/innodb/t/innodb_index_large_prefix.test
mysql-test/suite/innodb/t/innodb_prefix_index_liftedlimit.test
mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test
vio/viopipe.c
vio/vioshm.c
modified:
client/completion_hash.cc
client/mysql.cc
client/mysql_upgrade.c
client/mysqlbinlog.cc
client/mysqldump.c
client/mysqlslap.c
client/mysqltest.cc
client/sql_string.cc
cmake/install_layout.cmake
cmake/os/Windows.cmake
cmake/os/WindowsCache.cmake
cmake/plugin.cmake
config.h.cmake
configure.cmake
dbug/dbug.c
extra/comp_err.c
extra/replace.c
extra/yassl/include/openssl/ssl.h
extra/yassl/include/socket_wrapper.hpp
extra/yassl/src/handshake.cpp
extra/yassl/src/socket_wrapper.cpp
extra/yassl/src/ssl.cpp
include/hash.h
include/m_string.h
include/my_base.h
include/my_global.h
include/my_sys.h
include/myisampack.h
include/mysql.h.pp
include/mysql_com.h
include/violite.h
libmysql/errmsg.c
libmysql/libmysql.c
libmysqld/lib_sql.cc
mysql-test/collections/default.experimental
mysql-test/extra/binlog_tests/binlog_cache_stat.test
mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test
mysql-test/include/mysqlhotcopy.inc
mysql-test/include/plugin.defs
mysql-test/include/subquery.inc
mysql-test/mysql-test-run.pl
mysql-test/r/events_bugs.result
mysql-test/r/func_math.result
mysql-test/r/func_str.result
mysql-test/r/innodb_mysql_lock.result
mysql-test/r/innodb_mysql_sync.result
mysql-test/r/myisam_debug.result
mysql-test/r/openssl_1.result
mysql-test/r/query_cache_debug.result
mysql-test/r/ssl.result
mysql-test/r/subquery_nomat_nosj.result
mysql-test/r/subquery_none.result
mysql-test/r/wait_timeout.result
mysql-test/suite/binlog/r/binlog_mixed_cache_stat.result
mysql-test/suite/binlog/r/binlog_row_cache_stat.result
mysql-test/suite/binlog/r/binlog_stm_cache_stat.result
mysql-test/suite/innodb/include/innodb_stats.inc
mysql-test/suite/innodb/include/innodb_stats_bootstrap.inc
mysql-test/suite/innodb/r/innodb-index.result
mysql-test/suite/innodb/r/innodb_mysql.result
mysql-test/suite/innodb/r/innodb_stats.result
mysql-test/suite/innodb/r/innodb_stats_drop_locked.result
mysql-test/suite/innodb/t/innodb-index.test
mysql-test/suite/innodb/t/innodb_bug11933790.test
mysql-test/suite/innodb/t/innodb_mysql.test
mysql-test/suite/innodb/t/innodb_stats.test
mysql-test/suite/innodb/t/innodb_stats_drop_locked.test
mysql-test/suite/rpl/r/rpl_crash_safe_master.result
mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result
mysql-test/suite/rpl/t/rpl_crash_safe_master.test
mysql-test/suite/sys_vars/r/all_vars.result
mysql-test/suite/sys_vars/r/innodb_purge_batch_size_basic.result
mysql-test/t/events_bugs.test
mysql-test/t/func_math.test
mysql-test/t/func_str.test
mysql-test/t/innodb_mysql_lock.test
mysql-test/t/innodb_mysql_sync.test
mysql-test/t/myisam_debug.test
mysql-test/t/query_cache_debug.test
mysql-test/t/ssl.test
mysql-test/t/wait_timeout.test
mysql-test/t/xa.test
mysys/array.c
mysys/charset.c
mysys/default.c
mysys/lf_dynarray.c
mysys/mf_iocache.c
mysys/mf_keycache.c
mysys/mf_radix.c
mysys/my_aes.c
mysys/my_alloc.c
mysys/my_bitmap.c
mysys/my_chsize.c
mysys/my_file.c
mysys/my_gethwaddr.c
mysys/my_handler_errors.h
mysys/my_init.c
mysys/my_lib.c
mysys/my_malloc.c
mysys/my_once.c
mysys/my_wincond.c
mysys/my_windac.c
mysys/sha1.c
mysys/testhash.c
mysys/thr_alarm.c
mysys/thr_lock.c
mysys/thr_mutex.c
mysys/tree.c
mysys/waiting_threads.c
regex/regexp.c
regex/reginit.c
sql-common/client.c
sql-common/client_plugin.c
sql-common/my_time.c
sql/binlog.cc
sql/binlog.h
sql/debug_sync.cc
sql/des_key_file.cc
sql/event_data_objects.cc
sql/event_db_repository.cc
sql/event_db_repository.h
sql/events.cc
sql/field.cc
sql/field.h
sql/field_conv.cc
sql/filesort.cc
sql/gcalc_tools.h
sql/ha_ndbcluster.cc
sql/ha_ndbcluster_binlog.cc
sql/ha_partition.cc
sql/ha_partition.h
sql/handler.cc
sql/handler.h
sql/hash_filo.h
sql/item.cc
sql/item.h
sql/item_cmpfunc.h
sql/item_func.cc
sql/item_inetfunc.cc
sql/item_strfunc.cc
sql/item_sum.cc
sql/item_timefunc.cc
sql/item_xmlfunc.cc
sql/key.cc
sql/log.cc
sql/log_event.cc
sql/log_event.h
sql/log_event_old.cc
sql/mysqld.cc
sql/net_serv.cc
sql/opt_range.cc
sql/partition_info.cc
sql/password.c
sql/protocol.cc
sql/records.cc
sql/rpl_info_file.cc
sql/rpl_injector.cc
sql/rpl_master.cc
sql/rpl_rli.cc
sql/rpl_utility.cc
sql/rpl_utility.h
sql/set_var.cc
sql/share/errmsg-utf8.txt
sql/sp.cc
sql/sp_head.cc
sql/sql_acl.cc
sql/sql_alter.cc
sql/sql_analyse.cc
sql/sql_audit.cc
sql/sql_base.cc
sql/sql_cache.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_connect.cc
sql/sql_db.cc
sql/sql_delete.cc
sql/sql_error.cc
sql/sql_insert.cc
sql/sql_join_cache.cc
sql/sql_lex.cc
sql/sql_list.h
sql/sql_load.cc
sql/sql_parse.cc
sql/sql_partition_admin.cc
sql/sql_plugin.cc
sql/sql_prepare.cc
sql/sql_select.cc
sql/sql_select.h
sql/sql_show.cc
sql/sql_string.cc
sql/sql_table.cc
sql/sql_trigger.cc
sql/sql_trigger.h
sql/sql_udf.cc
sql/sql_union.cc
sql/sql_update.cc
sql/sql_view.cc
sql/sql_yacc.yy
sql/table.cc
sql/table.h
sql/thr_malloc.cc
sql/tztime.cc
sql/udf_example.c
sql/unireg.cc
sql/unireg.h
storage/blackhole/ha_blackhole.cc
storage/federated/ha_federated.cc
storage/heap/ha_heap.cc
storage/heap/hp_create.c
storage/heap/hp_hash.c
storage/heap/hp_test1.c
storage/heap/hp_test2.c
storage/innobase/data/data0data.c
storage/innobase/dict/dict0dict.c
storage/innobase/dict/dict0mem.c
storage/innobase/dict/dict0stats.c
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innobase/handler/handler0alter.cc
storage/innobase/include/db0err.h
storage/innobase/include/dict0dict.h
storage/innobase/include/dict0dict.ic
storage/innobase/include/dict0mem.h
storage/innobase/include/mtr0mtr.ic
storage/innobase/include/rem0types.h
storage/innobase/include/row0ext.h
storage/innobase/include/row0ext.ic
storage/innobase/include/sync0sync.h
storage/innobase/include/sync0sync.ic
storage/innobase/include/trx0purge.h
storage/innobase/lock/lock0lock.c
storage/innobase/mtr/mtr0mtr.c
storage/innobase/page/page0zip.c
storage/innobase/rem/rem0rec.c
storage/innobase/row/row0ext.c
storage/innobase/row/row0mysql.c
storage/innobase/row/row0row.c
storage/innobase/row/row0sel.c
storage/innobase/row/row0upd.c
storage/innobase/scripts/persistent_storage.sql
storage/innobase/srv/srv0srv.c
storage/innobase/trx/trx0purge.c
storage/innobase/trx/trx0rec.c
storage/innobase/ut/ut0ut.c
storage/myisam/ft_boolean_search.c
storage/myisam/ft_nlq_search.c
storage/myisam/ft_update.c
storage/myisam/ha_myisam.cc
storage/myisam/mi_cache.c
storage/myisam/mi_check.c
storage/myisam/mi_create.c
storage/myisam/mi_dynrec.c
storage/myisam/mi_key.c
storage/myisam/mi_log.c
storage/myisam/mi_open.c
storage/myisam/mi_packrec.c
storage/myisam/mi_rkey.c
storage/myisam/mi_statrec.c
storage/myisam/mi_test1.c
storage/myisam/mi_test2.c
storage/myisam/mi_test3.c
storage/myisam/myisamchk.c
storage/myisam/myisamlog.c
storage/myisam/myisampack.c
storage/myisam/rt_test.c
storage/myisam/sort.c
storage/myisam/sp_key.c
storage/myisam/sp_test.c
storage/myisammrg/ha_myisammrg.cc
storage/myisammrg/myrg_open.c
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp
storage/ndb/src/kernel/blocks/tsman.cpp
storage/ndb/src/kernel/vm/RWPool.cpp
storage/ndb/src/kernel/vm/WOPool.cpp
storage/ndb/src/kernel/vm/bench_pool.cpp
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
storage/ndb/test/ndbapi/testNodeRestart.cpp
storage/ndb/test/run-test/setup.cpp
storage/ndb/test/src/DbUtil.cpp
strings/conf_to_src.c
strings/ctype-czech.c
strings/ctype-mb.c
strings/ctype-simple.c
strings/ctype-uca.c
strings/ctype-win1250ch.c
strings/ctype.c
strings/decimal.c
strings/dump_map.c
strings/my_vsnprintf.c
strings/uca-dump.c
strings/uctypedump.c
strings/xml.c
support-files/build-tags
tests/mysql_client_test.c
unittest/gunit/item-t.cc
unittest/gunit/test_utils.h
unittest/mysys/waiting_threads-t.c
vio/CMakeLists.txt
vio/test-ssl.c
vio/test-sslclient.c
vio/test-sslserver.c
vio/vio.c
vio/vio_priv.h
vio/viosocket.c
vio/viossl.c
vio/viosslfactories.c
vio/viotest-ssl.c
Diff too large for email (23206 lines, the limit is 10000).
No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).
| Thread |
|---|
| • bzr commit into mysql-trunk-wl5378 branch (marc.alff:3356) | Marc Alff | 3 Jun |
