From: Marc Alff Date: February 1 2012 6:27pm Subject: bzr push into mysql-trunk-wl5259 branch (marc.alff:3367 to 3368) List-Archive: http://lists.mysql.com/commits/142702 Message-Id: <201202011827.q11IRHG8030917@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3368 Marc Alff 2012-02-01 [merge] Merge mysql-trunk --> mysql-trunk-wl5259 added: mysql-test/include/function_defaults.inc mysql-test/include/function_defaults_notembedded.inc mysql-test/include/libdaemon_example.ini mysql-test/r/function_defaults.result mysql-test/r/function_defaults_notembedded.result mysql-test/std_data/onerow.xml mysql-test/suite/rpl/r/rpl_function_defaults.result mysql-test/suite/rpl/t/rpl_function_defaults.test mysql-test/t/function_defaults.test mysql-test/t/function_defaults_notembedded.test mysql-test/wl5874_updown sql/delayable_insert_operation.h unittest/gunit/copy_info-t.cc unittest/gunit/create_field-t.cc unittest/gunit/delayable_insert_operation-t.cc unittest/gunit/fake_table.h unittest/gunit/field_timestamp-t.cc unittest/gunit/item_func_now_local-t.cc unittest/gunit/mock_create_field.h unittest/gunit/mock_field_datetime.h unittest/gunit/mock_field_timestamp.h unittest/gunit/mock_field_timestampf.h unittest/gunit/sql_table-t.cc modified: client/mysql_plugin.c include/my_bitmap.h mysql-test/collections/default.daily mysql-test/collections/default.weekly mysql-test/include/subquery_sj.inc mysql-test/r/change_user.result mysql-test/r/create.result mysql-test/r/derived.result mysql-test/r/func_in_all.result mysql-test/r/group_by.result mysql-test/r/group_min_max.result mysql-test/r/index_merge_myisam.result mysql-test/r/innodb_icp_all.result mysql-test/r/innodb_mrr_all.result mysql-test/r/innodb_mrr_cost_all.result mysql-test/r/join_cache_bka.result mysql-test/r/join_cache_bka_nixbnl.result mysql-test/r/join_cache_bkaunique.result mysql-test/r/join_cache_bnl.result mysql-test/r/join_cache_nojb.result mysql-test/r/myisam_explain_non_select_all.result mysql-test/r/mysql_plugin.result mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/r/mysqldump.result mysql-test/r/optimizer_debug_sync.result mysql-test/r/order_by_all.result mysql-test/r/subquery_all.result mysql-test/r/subquery_all_bka.result mysql-test/r/subquery_mat.result mysql-test/r/subquery_mat_none.result mysql-test/r/subquery_sj_all.result mysql-test/r/subquery_sj_all_bka.result mysql-test/r/subquery_sj_all_bka_nixbnl.result mysql-test/r/subquery_sj_all_bkaunique.result mysql-test/r/subquery_sj_dupsweed.result mysql-test/r/subquery_sj_dupsweed_bka.result mysql-test/r/subquery_sj_dupsweed_bka_nixbnl.result mysql-test/r/subquery_sj_dupsweed_bkaunique.result mysql-test/r/subquery_sj_firstmatch.result mysql-test/r/subquery_sj_firstmatch_bka.result mysql-test/r/subquery_sj_firstmatch_bka_nixbnl.result mysql-test/r/subquery_sj_firstmatch_bkaunique.result mysql-test/r/subquery_sj_loosescan.result mysql-test/r/subquery_sj_loosescan_bka.result mysql-test/r/subquery_sj_loosescan_bka_nixbnl.result mysql-test/r/subquery_sj_loosescan_bkaunique.result mysql-test/r/subquery_sj_mat.result mysql-test/r/subquery_sj_mat_bka.result mysql-test/r/subquery_sj_mat_bka_nixbnl.result mysql-test/r/subquery_sj_mat_bkaunique.result mysql-test/r/subquery_sj_mat_nosj.result mysql-test/r/subquery_sj_none.result mysql-test/r/subquery_sj_none_bka.result mysql-test/r/subquery_sj_none_bka_nixbnl.result mysql-test/r/subquery_sj_none_bkaunique.result mysql-test/r/subselect_innodb.result mysql-test/r/type_temporal_fractional.result mysql-test/r/type_timestamp.result mysql-test/suite/innodb/r/innodb_mysql.result mysql-test/suite/opt_trace/r/bugs_no_prot_all.result mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result mysql-test/suite/sys_vars/r/optimizer_switch_basic.result mysql-test/t/change_user.test mysql-test/t/create.test mysql-test/t/group_by.test mysql-test/t/mysql_plugin.test mysql-test/t/mysqldump.test mysql-test/t/optimizer_debug_sync.test mysql-test/t/type_temporal_fractional.test mysql-test/t/type_timestamp.test mysys/my_bitmap.c sql/event_db_repository.cc sql/field.cc sql/field.h sql/field_conv.cc sql/ha_ndbcluster.cc sql/ha_partition.cc sql/item.cc sql/item.h sql/item_timefunc.cc sql/item_timefunc.h sql/log_event.cc sql/log_event_old.cc sql/rpl_info_table.cc sql/sp.cc sql/sp_head.cc sql/sql_base.cc sql/sql_class.cc sql/sql_class.h sql/sql_executor.cc sql/sql_insert.cc sql/sql_insert.h sql/sql_load.cc sql/sql_parse.cc sql/sql_partition.cc sql/sql_priv.h sql/sql_show.cc sql/sql_table.cc sql/sql_table.h sql/sql_update.cc sql/table.cc sql/table.h sql/unireg.cc storage/archive/ha_archive.cc storage/csv/ha_tina.cc storage/example/ha_example.cc storage/federated/ha_federated.cc storage/heap/ha_heap.cc storage/innobase/fil/fil0fil.cc storage/innobase/handler/ha_innodb.cc storage/myisam/ha_myisam.cc storage/myisammrg/ha_myisammrg.cc unittest/gunit/CMakeLists.txt 3367 Marc Alff 2012-02-01 Work in progress modified: mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result mysql-test/suite/perfschema/r/hostcache_ipv4_format.result mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result mysql-test/suite/perfschema/r/hostcache_peer_addr.result mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_allow.test mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_deny.test mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_allow.test mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_deny.test mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_allow.test mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_deny.test mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_allow.test mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_deny.test mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin.test mysql-test/suite/perfschema/t/hostcache_ipv4_blocked.test mysql-test/suite/perfschema/t/hostcache_ipv4_format.test mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_allow.test mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_deny.test mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_allow.test mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_deny.test mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.test mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow.test mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny.test mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow.test mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow.test mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny.test mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow.test mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test mysql-test/suite/perfschema/t/hostcache_peer_addr.test sql/mysqld.cc sql/mysqld.h sql/sql_connect.cc Diff too large for email (14071 lines, the limit is 10000). No bundle (reason: useless for push emails).