List:Commits« Previous MessageNext Message »
From:Christopher Powers Date:August 14 2010 10:18pm
Subject:bzr push into mysql-next-mr-wl4896 branch (chris.powers:3163 to 3164)
View as plain text  
 3164 Christopher Powers	2010-08-14
      merge bugfix

    modified:
      sql/mysqld.cc
 3163 Christopher Powers	2010-08-14 [merge]
      merge

    removed:
      include/config-win.h
      include/my_trie.h
      include/my_vle.h
      libmysql/dll.c
      mysql-test/r/raid.result
      mysys/default_modify.c
      mysys/make-conf.c
      mysys/mf_wfile.c
      mysys/my_append.c
      mysys/my_clock.c
      mysys/my_dup.c
      mysys/my_net.c
      mysys/my_vle.c
      mysys/test_fn.c
      mysys/trie.c
      sql/sql_map.cc
      sql/sql_map.h
      sql/sql_olap.cc
      strings/bmove512.c
      strings/bmove_upp-sparc.s
      strings/r_strinstr.c
      strings/strappend-sparc.s
      strings/strend-sparc.s
      strings/strings-not-used.h
      strings/strinstr-sparc.s
      strings/strinstr.c
      strings/strmake-sparc.s
      strings/strmov-sparc.s
      strings/strnmov-sparc.s
      strings/strstr-sparc.s
      strings/strxmov-sparc.s
    added:
      mysql-test/collections/mysql-next-mr-wl4445.push
      mysql-test/r/merge_mmap.result
      mysql-test/r/partition_exchange.result
      mysql-test/suite/innodb/r/innodb_bug52199.result
      mysql-test/suite/innodb/r/innodb_bug54679.result
      mysql-test/suite/innodb/r/innodb_monitor.result
      mysql-test/suite/innodb/t/innodb_bug52199.test
      mysql-test/suite/innodb/t/innodb_bug54679.test
      mysql-test/suite/innodb/t/innodb_monitor.test
      mysql-test/suite/parts/inc/partition_crash.inc
      mysql-test/suite/parts/inc/partition_crash_exchange.inc
      mysql-test/suite/parts/inc/partition_crash_t2.inc
      mysql-test/suite/parts/inc/partition_exchange.inc
      mysql-test/suite/parts/inc/partition_fail_exchange.inc
      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/parts/r/partition_exchange_archive.result
      mysql-test/suite/parts/r/partition_exchange_blackhole.result
      mysql-test/suite/parts/r/partition_exchange_innodb.result
      mysql-test/suite/parts/r/partition_exchange_memory.result
      mysql-test/suite/parts/r/partition_exchange_myisam.result
      mysql-test/suite/parts/t/partition_debug-master.opt
      mysql-test/suite/parts/t/partition_debug.test
      mysql-test/suite/parts/t/partition_debug_innodb-master.opt
      mysql-test/suite/parts/t/partition_debug_innodb.test
      mysql-test/suite/parts/t/partition_exchange_archive.test
      mysql-test/suite/parts/t/partition_exchange_blackhole.test
      mysql-test/suite/parts/t/partition_exchange_innodb.test
      mysql-test/suite/parts/t/partition_exchange_memory.test
      mysql-test/suite/parts/t/partition_exchange_myisam.test
      mysql-test/suite/perfschema/include/upgrade_check.inc
      mysql-test/suite/perfschema/t/selects-master.opt
      mysql-test/suite/rpl/include/rpl_partition.inc
      mysql-test/suite/rpl/r/rpl_conditional_comments.result
      mysql-test/suite/rpl/r/rpl_partition_archive.result
      mysql-test/suite/rpl/r/rpl_partition_innodb.result
      mysql-test/suite/rpl/r/rpl_partition_memory.result
      mysql-test/suite/rpl/r/rpl_partition_myisam.result
      mysql-test/suite/rpl/t/rpl_conditional_comments.test
      mysql-test/suite/rpl/t/rpl_partition_archive.test
      mysql-test/suite/rpl/t/rpl_partition_innodb-master.opt
      mysql-test/suite/rpl/t/rpl_partition_innodb.test
      mysql-test/suite/rpl/t/rpl_partition_memory.test
      mysql-test/suite/rpl/t/rpl_partition_myisam.test
      mysql-test/suite/sys_vars/r/innodb_page_hash_mutexes_basic.result
      mysql-test/suite/sys_vars/t/innodb_page_hash_mutexes_basic.test
      mysql-test/t/merge_mmap-master.opt
      mysql-test/t/merge_mmap.test
      mysql-test/t/partition_exchange.test
      packaging/Makefile.am
      packaging/WiX/custom_ui.wxs
      sql/sql_alter_table.cc
      sql/sql_alter_table.h
      sql/sql_hset.h
      sql/sql_partition_admin.cc
      sql/sql_partition_admin.h
      storage/innobase/include/srv0mon.h
      storage/innobase/include/srv0mon.ic
      storage/innobase/srv/srv0mon.c
      unittest/gunit/my_regex-t.cc
      unittest/strings/
      unittest/strings/Makefile.am
      unittest/strings/strings-t.c
    renamed:
      BUILD/choose_configure.sh => BUILD/cmake_configure.sh
    modified:
      .bzrignore
      BUILD/FINISH.sh
      BUILD/Makefile.am
      BUILD/SETUP.sh
      BUILD/autorun.sh
      CMakeLists.txt
      Makefile.am
      client/mysql.cc
      client/mysql_upgrade.c
      client/mysqlbinlog.cc
      client/mysqldump.c
      client/mysqltest.cc
      cmake/abi_check.cmake
      cmake/os/WindowsCache.cmake
      config.h.cmake
      config/ac-macros/character_sets.m4
      configure.cmake
      configure.in
      extra/comp_err.c
      extra/replace.c
      extra/resolve_stack_dump.c
      extra/yassl/CMakeLists.txt
      extra/yassl/src/yassl_imp.cpp
      extra/yassl/taocrypt/CMakeLists.txt
      include/Makefile.am
      include/atomic/gcc_builtins.h
      include/atomic/nolock.h
      include/atomic/solaris.h
      include/atomic/x86-gcc.h
      include/m_string.h
      include/my_atomic.h
      include/my_attribute.h
      include/my_bit.h
      include/my_bitmap.h
      include/my_global.h
      include/my_net.h
      include/my_nosys.h
      include/my_pthread.h
      include/my_sys.h
      include/myisam.h
      include/mysql.h
      include/mysql.h.pp
      include/mysql/plugin.h.pp
      include/mysql/service_my_snprintf.h
      include/mysql/service_thd_alloc.h
      include/mysql_embed.h
      include/mysys_err.h
      include/thr_lock.h
      libmysql/Makefile.am
      libmysql/Makefile.shared
      libmysql/errmsg.c
      libmysql/libmysql.c
      libmysql_r/Makefile.am
      libmysqld/CMakeLists.txt
      libmysqld/Makefile.am
      mysql-test/collections/default.experimental
      mysql-test/include/handler.inc
      mysql-test/lib/v1/mysql-test-run.pl
      mysql-test/r/alter_table.result
      mysql-test/r/archive.result
      mysql-test/r/func_regexp.result
      mysql-test/r/handler_innodb.result
      mysql-test/r/handler_myisam.result
      mysql-test/r/heap_hash.result
      mysql-test/r/innodb_mysql_lock.result
      mysql-test/r/innodb_mysql_sync.result
      mysql-test/r/lowercase_table2.result
      mysql-test/r/mdl_sync.result
      mysql-test/r/merge.result
      mysql-test/r/mysqlshow.result
      mysql-test/r/mysqltest.result
      mysql-test/r/partition_debug_sync.result
      mysql-test/r/partition_error.result
      mysql-test/r/partition_symlink.result
      mysql-test/r/schema.result
      mysql-test/r/show_check.result
      mysql-test/r/signal.result
      mysql-test/r/signal_demo3.result
      mysql-test/r/sp-big.result
      mysql-test/r/sp-bugs.result
      mysql-test/r/sp-code.result
      mysql-test/r/sp-error.result
      mysql-test/r/sp.result
      mysql-test/r/sp_trans.result
      mysql-test/r/strict.result
      mysql-test/r/temp_table.result
      mysql-test/r/variables.result
      mysql-test/r/view.result
      mysql-test/suite/federated/federated_server.result
      mysql-test/suite/federated/federated_server.test
      mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
      mysql-test/suite/funcs_1/r/memory_storedproc_02.result
      mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
      mysql-test/suite/funcs_1/r/storedproc.result
      mysql-test/suite/innodb/r/innodb_information_schema.result
      mysql-test/suite/ndb/t/disabled.def
      mysql-test/suite/parts/inc/partition_check_drop.inc
      mysql-test/suite/parts/inc/partition_mgm.inc
      mysql-test/suite/parts/r/partition_mgm_lc0_archive.result
      mysql-test/suite/parts/r/partition_mgm_lc0_innodb.result
      mysql-test/suite/parts/r/partition_mgm_lc0_memory.result
      mysql-test/suite/parts/r/partition_mgm_lc0_myisam.result
      mysql-test/suite/parts/r/partition_mgm_lc1_archive.result
      mysql-test/suite/parts/r/partition_mgm_lc1_innodb.result
      mysql-test/suite/parts/r/partition_mgm_lc1_memory.result
      mysql-test/suite/parts/r/partition_mgm_lc1_myisam.result
      mysql-test/suite/parts/r/partition_mgm_lc2_archive.result
      mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result
      mysql-test/suite/parts/r/partition_mgm_lc2_memory.result
      mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result
      mysql-test/suite/parts/r/partition_recover_myisam.result
      mysql-test/suite/parts/r/partition_repair_myisam.result
      mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test
      mysql-test/suite/parts/t/partition_alter1_1_2_myisam.test
      mysql-test/suite/parts/t/partition_alter1_1_2_ndb.test
      mysql-test/suite/parts/t/partition_alter1_1_innodb.test
      mysql-test/suite/parts/t/partition_alter1_1_myisam.test
      mysql-test/suite/parts/t/partition_alter1_1_ndb.test
      mysql-test/suite/parts/t/partition_alter1_2_innodb.test
      mysql-test/suite/parts/t/partition_alter1_2_myisam.test
      mysql-test/suite/parts/t/partition_alter1_2_ndb.test
      mysql-test/suite/parts/t/partition_alter2_1_1_innodb.test
      mysql-test/suite/parts/t/partition_alter2_1_2_innodb.test
      mysql-test/suite/parts/t/partition_alter2_1_myisam.test
      mysql-test/suite/parts/t/partition_alter2_2_1_innodb.test
      mysql-test/suite/parts/t/partition_alter2_2_2_innodb.test
      mysql-test/suite/parts/t/partition_alter2_2_myisam.test
      mysql-test/suite/parts/t/partition_alter3_innodb.test
      mysql-test/suite/parts/t/partition_alter3_myisam.test
      mysql-test/suite/parts/t/partition_alter4_innodb.test
      mysql-test/suite/parts/t/partition_alter4_myisam.test
      mysql-test/suite/parts/t/partition_basic_innodb.test
      mysql-test/suite/parts/t/partition_basic_myisam.test
      mysql-test/suite/parts/t/partition_basic_ndb.test
      mysql-test/suite/parts/t/partition_basic_symlink_innodb.test
      mysql-test/suite/parts/t/partition_basic_symlink_myisam.test
      mysql-test/suite/parts/t/partition_debug_sync_innodb.test
      mysql-test/suite/parts/t/partition_engine_innodb.test
      mysql-test/suite/parts/t/partition_engine_myisam.test
      mysql-test/suite/parts/t/partition_mgm_lc0_ndb.test
      mysql-test/suite/parts/t/partition_mgm_lc1_ndb.test
      mysql-test/suite/parts/t/partition_mgm_lc2_ndb.test
      mysql-test/suite/parts/t/partition_recover_myisam.test
      mysql-test/suite/parts/t/partition_repair_myisam.test
      mysql-test/suite/parts/t/partition_special_innodb.test
      mysql-test/suite/parts/t/partition_syntax_innodb.test
      mysql-test/suite/parts/t/partition_syntax_myisam.test
      mysql-test/suite/perfschema/include/pfs_upgrade.inc
      mysql-test/suite/perfschema/r/query_cache.result
      mysql-test/suite/perfschema/r/selects.result
      mysql-test/suite/perfschema/r/server_init.result
      mysql-test/suite/perfschema/t/bad_option_1.test
      mysql-test/suite/perfschema/t/bad_option_2.test
      mysql-test/suite/perfschema/t/global_read_lock.test
      mysql-test/suite/perfschema/t/privilege.test
      mysql-test/suite/perfschema/t/query_cache.test
      mysql-test/suite/perfschema/t/read_only.test
      mysql-test/suite/perfschema/t/selects.test
      mysql-test/suite/perfschema/t/server_init.test
      mysql-test/suite/rpl/r/rpl_do_grant.result
      mysql-test/suite/rpl/r/rpl_grant.result
      mysql-test/suite/rpl/r/rpl_packet.result
      mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result
      mysql-test/suite/rpl/r/rpl_row_sp005.result
      mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result
      mysql-test/suite/rpl/r/rpl_row_trig003.result
      mysql-test/suite/rpl/t/rpl_grant.test
      mysql-test/suite/rpl/t/rpl_packet.test
      mysql-test/suite/rpl/t/rpl_sync-slave.opt
      mysql-test/suite/sys_vars/r/all_vars.result
      mysql-test/t/alter_table.test
      mysql-test/t/archive.test
      mysql-test/t/func_regexp.test
      mysql-test/t/heap_hash.test
      mysql-test/t/innodb_mysql_lock.test
      mysql-test/t/innodb_mysql_sync.test
      mysql-test/t/mdl_sync.test
      mysql-test/t/merge-big.test
      mysql-test/t/merge.test
      mysql-test/t/mysqltest.test
      mysql-test/t/partition_debug_sync.test
      mysql-test/t/partition_error.test
      mysql-test/t/partition_symlink.test
      mysql-test/t/schema.test
      mysql-test/t/show_check.test
      mysql-test/t/signal.test
      mysql-test/t/sp-code.test
      mysql-test/t/sp-error.test
      mysql-test/t/sp.test
      mysql-test/t/temp_table.test
      mysql-test/t/variables.test
      mysys/CMakeLists.txt
      mysys/Makefile.am
      mysys/checksum.c
      mysys/default.c
      mysys/errors.c
      mysys/mf_iocache.c
      mysys/mf_iocache2.c
      mysys/mf_keycache.c
      mysys/my_atomic.c
      mysys/my_bit.c
      mysys/my_bitmap.c
      mysys/my_copy.c
      mysys/my_handler.c
      mysys/my_init.c
      mysys/my_pthread.c
      mysys/my_redel.c
      mysys/my_static.c
      mysys/my_static.h
      mysys/rijndael.c
      mysys/test_charset.c
      mysys/thr_alarm.c
      mysys/thr_lock.c
      packaging/WiX/CMakeLists.txt
      packaging/WiX/CPackWixConfig.cmake
      packaging/WiX/create_msi.cmake.in
      packaging/WiX/extra.wxs.in
      packaging/WiX/mysql_server.wxs.in
      regex/CMakeLists.txt
      regex/engine.c
      regex/main.c
      regex/my_regex.h
      regex/regcomp.c
      regex/regcomp.ih
      regex/regerror.c
      regex/regex2.h
      regex/regexec.c
      regex/tests
      scripts/make_win_bin_dist
      sql/CMakeLists.txt
      sql/Makefile.am
      sql/binlog.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/gen_lex_hash.cc
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_cond.cc
      sql/ha_partition.cc
      sql/ha_partition.h
      sql/handler.cc
      sql/handler.h
      sql/hostname.cc
      sql/item.cc
      sql/item.h
      sql/item_cmpfunc.cc
      sql/item_cmpfunc.h
      sql/item_geofunc.cc
      sql/item_subselect.h
      sql/lex.h
      sql/lock.cc
      sql/lock.h
      sql/log.cc
      sql/log.h
      sql/log_event.cc
      sql/mdl.cc
      sql/mdl.h
      sql/mysqld.cc
      sql/mysqld.h
      sql/nt_servc.cc
      sql/opt_range.cc
      sql/partition_info.cc
      sql/partition_info.h
      sql/protocol.cc
      sql/rpl_master.cc
      sql/rpl_record.cc
      sql/rpl_rli.cc
      sql/rpl_slave.cc
      sql/set_var.cc
      sql/share/errmsg-utf8.txt
      sql/sp.cc
      sql/sp_head.cc
      sql/sp_head.h
      sql/sp_pcontext.h
      sql/sp_rcontext.cc
      sql/sp_rcontext.h
      sql/spatial.cc
      sql/sql_acl.cc
      sql/sql_base.cc
      sql/sql_base.h
      sql/sql_binlog.cc
      sql/sql_cache.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_cursor.cc
      sql/sql_cursor.h
      sql/sql_db.cc
      sql/sql_db.h
      sql/sql_delete.cc
      sql/sql_do.cc
      sql/sql_error.cc
      sql/sql_error.h
      sql/sql_handler.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_parse.h
      sql/sql_partition.cc
      sql/sql_partition.h
      sql/sql_plugin.cc
      sql/sql_prepare.cc
      sql/sql_priv.h
      sql/sql_rename.cc
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_servers.cc
      sql/sql_show.cc
      sql/sql_signal.cc
      sql/sql_table.cc
      sql/sql_table.h
      sql/sql_trigger.cc
      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/sys_vars.cc
      sql/table.cc
      sql/table.h
      sql/transaction.cc
      sql/tztime.cc
      sql/udf_example.c
      storage/archive/azio.c
      storage/archive/ha_archive.cc
      storage/archive/ha_archive.h
      storage/csv/ha_tina.cc
      storage/example/ha_example.cc
      storage/federated/ha_federated.cc
      storage/heap/ha_heap.cc
      storage/heap/hp_test2.c
      storage/innobase/CMakeLists.txt
      storage/innobase/Makefile.am
      storage/innobase/btr/btr0btr.c
      storage/innobase/btr/btr0cur.c
      storage/innobase/btr/btr0sea.c
      storage/innobase/buf/buf0buddy.c
      storage/innobase/buf/buf0buf.c
      storage/innobase/buf/buf0flu.c
      storage/innobase/buf/buf0lru.c
      storage/innobase/buf/buf0rea.c
      storage/innobase/data/data0data.c
      storage/innobase/data/data0type.c
      storage/innobase/dict/dict0boot.c
      storage/innobase/dict/dict0crea.c
      storage/innobase/dict/dict0dict.c
      storage/innobase/dict/dict0load.c
      storage/innobase/dict/dict0mem.c
      storage/innobase/fil/fil0fil.c
      storage/innobase/fsp/fsp0fsp.c
      storage/innobase/ha/ha0ha.c
      storage/innobase/ha/hash0hash.c
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/handler0alter.cc
      storage/innobase/handler/i_s.cc
      storage/innobase/handler/i_s.h
      storage/innobase/ibuf/ibuf0ibuf.c
      storage/innobase/include/btr0btr.h
      storage/innobase/include/btr0btr.ic
      storage/innobase/include/btr0cur.h
      storage/innobase/include/btr0sea.h
      storage/innobase/include/buf0buf.h
      storage/innobase/include/buf0buf.ic
      storage/innobase/include/buf0lru.h
      storage/innobase/include/data0data.h
      storage/innobase/include/data0data.ic
      storage/innobase/include/data0type.h
      storage/innobase/include/data0type.ic
      storage/innobase/include/dict0boot.h
      storage/innobase/include/dict0boot.ic
      storage/innobase/include/dict0dict.h
      storage/innobase/include/dict0dict.ic
      storage/innobase/include/dict0load.h
      storage/innobase/include/dict0mem.h
      storage/innobase/include/dict0mem.ic
      storage/innobase/include/dict0types.h
      storage/innobase/include/fil0fil.h
      storage/innobase/include/ha0ha.h
      storage/innobase/include/hash0hash.h
      storage/innobase/include/lock0lock.h
      storage/innobase/include/log0log.ic
      storage/innobase/include/mach0data.h
      storage/innobase/include/mach0data.ic
      storage/innobase/include/mem0mem.h
      storage/innobase/include/mtr0log.h
      storage/innobase/include/mtr0log.ic
      storage/innobase/include/mtr0mtr.h
      storage/innobase/include/os0file.h
      storage/innobase/include/os0sync.h
      storage/innobase/include/os0sync.ic
      storage/innobase/include/page0page.h
      storage/innobase/include/page0page.ic
      storage/innobase/include/pars0pars.h
      storage/innobase/include/que0que.h
      storage/innobase/include/read0read.h
      storage/innobase/include/read0read.ic
      storage/innobase/include/rem0rec.h
      storage/innobase/include/rem0rec.ic
      storage/innobase/include/row0mysql.h
      storage/innobase/include/row0upd.h
      storage/innobase/include/srv0srv.h
      storage/innobase/include/sync0sync.h
      storage/innobase/include/trx0i_s.h
      storage/innobase/include/trx0rec.h
      storage/innobase/include/trx0rec.ic
      storage/innobase/include/trx0sys.h
      storage/innobase/include/trx0sys.ic
      storage/innobase/include/trx0trx.h
      storage/innobase/include/trx0trx.ic
      storage/innobase/include/trx0types.h
      storage/innobase/include/trx0undo.h
      storage/innobase/include/trx0undo.ic
      storage/innobase/include/univ.i
      storage/innobase/include/ut0byte.h
      storage/innobase/include/ut0byte.ic
      storage/innobase/include/ut0rnd.h
      storage/innobase/include/ut0rnd.ic
      storage/innobase/lock/lock0lock.c
      storage/innobase/log/log0log.c
      storage/innobase/log/log0recv.c
      storage/innobase/mach/mach0data.c
      storage/innobase/mtr/mtr0log.c
      storage/innobase/mtr/mtr0mtr.c
      storage/innobase/os/os0file.c
      storage/innobase/os/os0sync.c
      storage/innobase/os/os0thread.c
      storage/innobase/page/page0page.c
      storage/innobase/page/page0zip.c
      storage/innobase/pars/pars0pars.c
      storage/innobase/read/read0read.c
      storage/innobase/row/row0ins.c
      storage/innobase/row/row0merge.c
      storage/innobase/row/row0mysql.c
      storage/innobase/row/row0purge.c
      storage/innobase/row/row0row.c
      storage/innobase/row/row0sel.c
      storage/innobase/row/row0uins.c
      storage/innobase/row/row0umod.c
      storage/innobase/row/row0undo.c
      storage/innobase/row/row0upd.c
      storage/innobase/row/row0vers.c
      storage/innobase/srv/srv0srv.c
      storage/innobase/srv/srv0start.c
      storage/innobase/sync/sync0arr.c
      storage/innobase/sync/sync0sync.c
      storage/innobase/trx/trx0i_s.c
      storage/innobase/trx/trx0purge.c
      storage/innobase/trx/trx0rec.c
      storage/innobase/trx/trx0roll.c
      storage/innobase/trx/trx0rseg.c
      storage/innobase/trx/trx0sys.c
      storage/innobase/trx/trx0trx.c
      storage/innobase/trx/trx0undo.c
      storage/innobase/ut/ut0byte.c
      storage/myisam/ft_boolean_search.c
      storage/myisam/ft_nlq_search.c
      storage/myisam/ft_parser.c
      storage/myisam/ft_update.c
      storage/myisam/mi_check.c
      storage/myisam/mi_create.c
      storage/myisam/mi_delete_table.c
      storage/myisam/mi_dynrec.c
      storage/myisam/mi_key.c
      storage/myisam/mi_locking.c
      storage/myisam/mi_log.c
      storage/myisam/mi_open.c
      storage/myisam/mi_packrec.c
      storage/myisam/mi_rename.c
      storage/myisam/mi_static.c
      storage/myisam/mi_statrec.c
      storage/myisam/mi_test1.c
      storage/myisam/mi_test2.c
      storage/myisam/mi_test3.c
      storage/myisam/mi_unique.c
      storage/myisam/mi_write.c
      storage/myisam/myisam_ftdump.c
      storage/myisam/myisamchk.c
      storage/myisam/myisamdef.h
      storage/myisam/myisamlog.c
      storage/myisam/myisampack.c
      storage/myisam/rt_split.c
      storage/myisam/rt_test.c
      storage/myisam/sp_key.c
      storage/myisam/sp_test.c
      storage/myisammrg/ha_myisammrg.cc
      storage/myisammrg/myrg_open.c
      storage/ndb/include/kernel/signaldata/FsOpenReq.hpp
      storage/ndb/include/util/ndb_opts.h
      storage/ndb/src/cw/cpcd/main.cpp
      storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp
      storage/ndb/src/kernel/vm/Configuration.cpp
      storage/ndb/src/mgmclient/main.cpp
      storage/ndb/src/mgmsrv/main.cpp
      storage/ndb/src/ndbapi/TransporterFacade.hpp
      storage/ndb/test/ndbapi/testIndexStat.cpp
      storage/ndb/test/ndbapi/test_event_merge.cpp
      storage/ndb/test/ndbapi/test_event_multi_table.cpp
      storage/ndb/test/run-test/main.cpp
      storage/ndb/test/src/NDBT_Test.cpp
      storage/ndb/test/tools/connect.cpp
      storage/ndb/tools/delete_all.cpp
      storage/ndb/tools/desc.cpp
      storage/ndb/tools/drop_index.cpp
      storage/ndb/tools/drop_tab.cpp
      storage/ndb/tools/listTables.cpp
      storage/ndb/tools/ndb_config.cpp
      storage/ndb/tools/restore/restore_main.cpp
      storage/ndb/tools/select_all.cpp
      storage/ndb/tools/select_count.cpp
      storage/ndb/tools/waiter.cpp
      storage/perfschema/pfs_events_waits.cc
      strings/CMakeLists.txt
      strings/Makefile.am
      strings/bfill.c
      strings/bmove.c
      strings/bmove_upp.c
      strings/ctype-big5.c
      strings/ctype-cp932.c
      strings/ctype-czech.c
      strings/ctype-euc_kr.c
      strings/ctype-eucjpms.c
      strings/ctype-gb2312.c
      strings/ctype-gbk.c
      strings/ctype-mb.c
      strings/ctype-simple.c
      strings/ctype-sjis.c
      strings/ctype-ucs2.c
      strings/ctype-ujis.c
      strings/ctype.c
      strings/decimal.c
      strings/do_ctype.c
      strings/str_test.c
      strings/strcend.c
      strings/strend.c
      strings/string.doc
      strings/strings-x86.s
      strings/strmov.c
      tests/mysql_client_test.c
      tests/thread_test.c
      unittest/Makefile.am
      unittest/gunit/CMakeLists.txt
      unittest/gunit/gunit_test_main.cc
      unittest/gunit/mdl-t.cc
      unittest/gunit/mdl_mytap-t.cc
      unittest/gunit/sql_list-t.cc
      unittest/gunit/tap_event_listener.cc
      unittest/gunit/thread_utils-t.cc
      unittest/gunit/thread_utils.cc
      unittest/gunit/thread_utils.h
      unittest/mysys/my_atomic-t.c
      unittest/mytap/tap.c
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2010-08-14 21:30:27 +0000
+++ b/sql/mysqld.cc	2010-08-14 22:07:49 +0000
@@ -1925,7 +1925,7 @@ static void network_init(void)
     (void) mysql_socket_setsockopt(unix_sock, SOL_SOCKET, SO_REUSEADDR, (char*)&arg,
 		      sizeof(arg));
     umask(0);
-    if (bind(mysql_socket_getfd(unix_sock), my_reinterpret_cast(struct sockaddr *) (&UNIXaddr),
+    if (bind(mysql_socket_getfd(unix_sock), reinterpret_cast<struct sockaddr *> (&UNIXaddr),
 	     sizeof(UNIXaddr)) < 0)
     {
       sql_perror("Can't start server : Bind on unix socket"); /* purecov: tested */


Attachment: [text/bzr-bundle] bzr/chris.powers@oracle.com-20100814220749-rm2d0oblfx96kv1q.bundle
Thread
bzr push into mysql-next-mr-wl4896 branch (chris.powers:3163 to 3164) Christopher Powers15 Aug