From: Mayank Prasad Date: June 7 2011 12:09pm Subject: bzr commit into mysql-trunk-wl5767 branch (mayank.prasad:3370) List-Archive: http://lists.mysql.com/commits/138763 Message-Id: <201106071209.p57C9uVl026037@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///home/mayank/mysql-tree/mysql-trunk-wl5767_merge/ based on revid:mayank.prasad@stripped 3370 Mayank Prasad 2011-06-07 [merge] merge from mysql-trunk removed: mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result mysql-test/suite/perfschema/r/schema_lc1.result mysql-test/suite/perfschema/r/schema_lc2.result mysql-test/suite/perfschema/t/pfs_upgrade_lc0.test mysql-test/suite/perfschema/t/pfs_upgrade_lc1.test mysql-test/suite/perfschema/t/pfs_upgrade_lc2.test mysql-test/suite/perfschema/t/schema_lc0.test mysql-test/suite/perfschema/t/schema_lc1.test mysql-test/suite/perfschema/t/schema_lc2.test added: extra/yassl/include/openssl/transport_types.h include/mysql/thread_pool_priv.h mysql-test/extra/rpl_tests/rpl_temp_error.test mysql-test/include/not_threadpool.inc mysql-test/include/start_slave_io.inc mysql-test/include/start_slave_sql.inc mysql-test/lib/mtr_results.pm mysql-test/r/archive_debug.result mysql-test/r/implicit_char_to_num_conversion.result mysql-test/r/status_bug17954.result mysql-test/suite/binlog/r/binlog_reset_master.result mysql-test/suite/binlog/t/binlog_reset_master.test mysql-test/suite/innodb/r/innodb-bug12552164.result 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-bug12552164.test 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 mysql-test/suite/perfschema/r/pfs_upgrade.result mysql-test/suite/perfschema/r/schema.result mysql-test/suite/perfschema/t/pfs_upgrade.test mysql-test/suite/perfschema/t/schema.test mysql-test/suite/rpl/r/rpl_DML_error.result mysql-test/suite/rpl/t/rpl_DML_error.test mysql-test/suite/rpl/t/rpl_typeconv-master.opt mysql-test/t/archive_debug.test mysql-test/t/implicit_char_to_num_conversion.test mysql-test/t/status_bug17954.test sql/mem_root_array.h unittest/gunit/dynarray-t.cc unittest/gunit/opt_range-t.cc unittest/gunit/test_utils.cc unittest/gunit/test_utils.h vio/viopipe.c vio/vioshm.c renamed: mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result => mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result.THIS mysql-test/suite/perfschema/r/schema_lc0.result => mysql-test/suite/perfschema/r/schema_lc0.result.THIS modified: .bzrignore BUILD/SETUP.sh BUILD/build_mccge.sh CMakeLists.txt client/completion_hash.cc client/mysql.cc* client/mysql_upgrade.c client/mysqladmin.cc client/mysqlbinlog.cc client/mysqlcheck.c client/mysqldump.c client/mysqlimport.c client/mysqlshow.c client/mysqlslap.c client/mysqltest.cc client/sql_string.cc cmake/configure.pl 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_compiler.h include/my_global.h include/my_sys.h include/myisampack.h include/mysql.h include/mysql.h.pp include/mysql/plugin_audit.h include/mysql/plugin_audit.h.pp include/mysql/plugin_auth.h.pp include/mysql/plugin_ftparser.h.pp include/mysql/service_thd_wait.h include/mysql_com.h include/violite.h libmysql/authentication_win/plugin_client.cc 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/binlog_tests/mix_innodb_myisam_binlog.test mysql-test/extra/rpl_tests/check_type.inc mysql-test/extra/rpl_tests/rpl_auto_increment.test mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.inc mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.test mysql-test/extra/rpl_tests/rpl_innodb.test mysql-test/extra/rpl_tests/rpl_mixing_engines.inc mysql-test/include/have_archive_plugin.inc mysql-test/include/have_blackhole_plugin.inc mysql-test/include/mrr_tests.inc mysql-test/include/mysqlhotcopy.inc mysql-test/include/range.inc mysql-test/include/subquery.inc mysql-test/include/wait_show_condition.inc mysql-test/lib/My/CoreDump.pm mysql-test/lib/My/Test.pm mysql-test/lib/mtr_misc.pl mysql-test/lib/mtr_report.pm mysql-test/mysql-test-run.pl 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_bugs.result mysql-test/r/explain.result mysql-test/r/func_in_all.result mysql-test/r/func_math.result mysql-test/r/func_str.result mysql-test/r/func_time.result mysql-test/r/group_min_max.result mysql-test/r/having.result mysql-test/r/innodb_mrr.result mysql-test/r/innodb_mrr_all.result mysql-test/r/innodb_mrr_cost.result mysql-test/r/innodb_mrr_cost_all.result mysql-test/r/innodb_mrr_cost_icp.result mysql-test/r/innodb_mrr_icp.result mysql-test/r/innodb_mrr_none.result mysql-test/r/innodb_mysql_lock.result mysql-test/r/innodb_mysql_sync.result mysql-test/r/metadata.result mysql-test/r/myisam_debug.result mysql-test/r/myisam_mrr.result mysql-test/r/myisam_mrr_all.result mysql-test/r/myisam_mrr_cost.result mysql-test/r/myisam_mrr_cost_all.result mysql-test/r/myisam_mrr_cost_icp.result mysql-test/r/myisam_mrr_icp.result mysql-test/r/myisam_mrr_none.result mysql-test/r/mysqlbinlog_base64.result mysql-test/r/mysqldump.result mysql-test/r/openssl_1.result mysql-test/r/query_cache_debug.result mysql-test/r/range_icp.result mysql-test/r/range_icp_mrr.result mysql-test/r/range_mrr.result mysql-test/r/range_mrr_cost.result mysql-test/r/range_none.result mysql-test/r/read_only_innodb.result mysql-test/r/ssl.result mysql-test/r/status.result mysql-test/r/subquery_all.result mysql-test/r/subquery_all_jcl6.result mysql-test/r/subquery_nomat_nosj.result mysql-test/r/subquery_nomat_nosj_jcl6.result mysql-test/r/subquery_none.result mysql-test/r/subquery_none_jcl6.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/r/wait_timeout.result mysql-test/suite/binlog/r/binlog_innodb_row.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_row_mix_innodb_myisam.result mysql-test/suite/binlog/r/binlog_stm_cache_stat.result mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result mysql-test/suite/binlog/t/binlog_bug23533.test mysql-test/suite/binlog/t/binlog_innodb_row.test mysql-test/suite/binlog/t/disabled.def mysql-test/suite/federated/disabled.def 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/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.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.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/parts/inc/partition_fail_t2.inc mysql-test/suite/parts/r/partition_debug.result mysql-test/suite/parts/r/partition_debug_innodb.result mysql-test/suite/perfschema/t/no_threads.test mysql-test/suite/perfschema/t/one_thread_per_con.test mysql-test/suite/rpl/r/rpl_auto_increment.result mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result mysql-test/suite/rpl/r/rpl_checksum.result mysql-test/suite/rpl/r/rpl_crash_safe_master.result mysql-test/suite/rpl/r/rpl_loaddatalocal.result mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result mysql-test/suite/rpl/r/rpl_non_direct_row_mixing_engines.result mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result mysql-test/suite/rpl/r/rpl_relayspace.result mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_row_crash_safe.result mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result mysql-test/suite/rpl/r/rpl_row_ignorable_event.result mysql-test/suite/rpl/r/rpl_row_mixing_engines.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_drop_create_temp_table.result mysql-test/suite/rpl/r/rpl_stm_innodb.result mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result mysql-test/suite/rpl/r/rpl_typeconv.result mysql-test/suite/rpl/t/disabled.def mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test mysql-test/suite/rpl/t/rpl_checksum.test mysql-test/suite/rpl/t/rpl_crash_safe_master.test mysql-test/suite/rpl/t/rpl_loaddatalocal.test mysql-test/suite/rpl/t/rpl_relayspace.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/suite/sys_vars/r/all_vars.result mysql-test/suite/sys_vars/r/innodb_purge_batch_size_basic.result mysql-test/suite/sys_vars/t/all_vars.test mysql-test/suite/sys_vars/t/disabled.def mysql-test/suite/sys_vars/t/slow_launch_time_func.test mysql-test/suite/sys_vars/t/thread_cache_size_func.test mysql-test/suite/sys_vars/t/wait_timeout_func.test mysql-test/t/disabled.def mysql-test/t/distinct.test mysql-test/t/events_bugs.test mysql-test/t/explain.test mysql-test/t/func_math.test mysql-test/t/func_str.test mysql-test/t/func_time.test mysql-test/t/having.test mysql-test/t/information_schema.test mysql-test/t/information_schema_db.test mysql-test/t/innodb_mysql_lock.test mysql-test/t/innodb_mysql_sync.test mysql-test/t/kill.test mysql-test/t/myisam_debug.test mysql-test/t/mysqlbinlog_base64.test mysql-test/t/mysqlbinlog_raw_mode.test mysql-test/t/mysqldump.test mysql-test/t/mysqlshow.test mysql-test/t/named_pipe.test mysql-test/t/no-threads.test mysql-test/t/query_cache_debug.test mysql-test/t/shm.test mysql-test/t/ssl.test mysql-test/t/status.test mysql-test/t/trigger.test mysql-test/t/type_newdecimal.test mysql-test/t/variables-big.test mysql-test/t/wait_timeout.test mysql-test/t/xa.test mysys/array.c mysys/charset.c mysys/default.c mysys/lf_alloc-pin.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_sync.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 packaging/WiX/ca/CMakeLists.txt packaging/WiX/create_msi.cmake.in packaging/WiX/custom_ui.wxs plugin/audit_null/audit_null.c regex/regexp.c regex/reginit.c scripts/make_win_bin_dist scripts/mysql_system_tables.sql 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/debug_sync.h sql/derror.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/filesort_utils.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.cc sql/item_cmpfunc.h sql/item_create.cc sql/item_func.cc sql/item_func.h sql/item_inetfunc.cc sql/item_row.cc sql/item_strfunc.cc sql/item_subselect.cc sql/item_sum.cc sql/item_timefunc.cc sql/item_xmlfunc.cc sql/item_xmlfunc.h sql/key.cc sql/log.cc sql/log.h sql/log_event.cc sql/log_event.h sql/log_event_old.cc sql/mdl.cc sql/my_decimal.cc sql/my_decimal.h sql/mysqld.cc sql/mysqld.h 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_injector.h sql/rpl_master.cc sql/rpl_reporting.cc sql/rpl_rli.cc sql/rpl_rli.h sql/rpl_slave.cc sql/rpl_utility.cc sql/rpl_utility.h sql/scheduler.cc sql/scheduler.h sql/set_var.cc sql/share/errmsg-utf8.txt sql/sp.cc sql/sp_head.cc sql/sp_head.h sql/sql_acl.cc sql/sql_alter.cc sql/sql_analyse.cc sql/sql_array.h sql/sql_audit.cc sql/sql_base.cc sql/sql_binlog.cc sql/sql_cache.cc sql/sql_class.cc sql/sql_class.h sql/sql_connect.cc sql/sql_connect.h sql/sql_const.h sql/sql_cursor.h 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_lex.h sql/sql_list.h sql/sql_load.cc sql/sql_parse.cc sql/sql_partition.cc sql/sql_partition.h sql/sql_partition_admin.cc sql/sql_plugin.cc sql/sql_prepare.cc sql/sql_priv.h sql/sql_reload.cc sql/sql_select.cc sql/sql_select.h sql/sql_show.cc sql/sql_string.cc sql/sql_table.cc sql/sql_test.cc sql/sql_test.h sql/sql_trigger.cc sql/sql_trigger.h sql/sql_truncate.cc sql/sql_udf.cc sql/sql_union.cc sql/sql_update.cc sql/sql_view.cc sql/sql_yacc.yy sql/structs.h sql/sys_vars.cc sql/table.cc sql/table.h sql/thr_malloc.cc sql/transaction.cc sql/tztime.cc sql/udf_example.c sql/uniques.cc sql/unireg.cc sql/unireg.h storage/archive/azio.c storage/archive/ha_archive.cc storage/blackhole/ha_blackhole.cc storage/example/ha_example.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/buf/buf0buf.c storage/innobase/buf/buf0flu.c storage/innobase/buf/buf0lru.c storage/innobase/data/data0data.c storage/innobase/dict/dict0crea.c storage/innobase/dict/dict0dict.c storage/innobase/dict/dict0mem.c storage/innobase/dict/dict0stats.c storage/innobase/fil/fil0fil.c storage/innobase/handler/ha_innodb.cc storage/innobase/handler/ha_innodb.h storage/innobase/handler/handler0alter.cc storage/innobase/handler/i_s.cc storage/innobase/include/buf0buf.h storage/innobase/include/db0err.h storage/innobase/include/dict0dict.h storage/innobase/include/dict0dict.ic storage/innobase/include/dict0mem.h storage/innobase/include/lock0priv.h storage/innobase/include/lock0priv.ic storage/innobase/include/mtr0mtr.ic storage/innobase/include/os0file.h storage/innobase/include/os0file.ic storage/innobase/include/page0page.h storage/innobase/include/page0page.ic storage/innobase/include/rem0types.h storage/innobase/include/row0ext.h storage/innobase/include/row0ext.ic storage/innobase/include/row0row.h storage/innobase/include/row0row.ic storage/innobase/include/sync0sync.h storage/innobase/include/sync0sync.ic storage/innobase/include/trx0purge.h storage/innobase/include/trx0rec.h storage/innobase/include/trx0trx.h storage/innobase/include/trx0types.h storage/innobase/include/ut0ut.h storage/innobase/lock/lock0lock.c storage/innobase/log/log0recv.c storage/innobase/mtr/mtr0mtr.c storage/innobase/os/os0file.c storage/innobase/page/page0page.c storage/innobase/page/page0zip.c storage/innobase/que/que0que.c storage/innobase/rem/rem0rec.c storage/innobase/row/row0ext.c storage/innobase/row/row0merge.c storage/innobase/row/row0mysql.c storage/innobase/row/row0row.c storage/innobase/row/row0sel.c storage/innobase/row/row0upd.c storage/innobase/row/row0vers.c storage/innobase/scripts/persistent_storage.sql storage/innobase/srv/srv0conc.c storage/innobase/srv/srv0srv.c storage/innobase/srv/srv0start.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/lgman.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 storage/perfschema/pfs.cc storage/perfschema/pfs_instr_class.cc storage/perfschema/pfs_instr_class.h storage/perfschema/pfs_setup_object.h storage/perfschema/table_setup_instruments.cc storage/perfschema/table_setup_instruments.h 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/CMakeLists.txt unittest/gunit/item-t.cc unittest/gunit/mdl-t.cc unittest/gunit/mdl_mytap-t.cc unittest/mysys/lf-t.c 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 (56827 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)).