From: Christopher Powers Date: July 1 2010 9:26pm Subject: bzr push into mysql-next-mr-wl4896 branch (chris.powers:3150 to 3151) WL#4896 List-Archive: http://lists.mysql.com/commits/112707 Message-Id: <20100701212632.0151B1DB0305@xeno.mysql.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7592254792042796212==" --===============7592254792042796212== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 3151 Christopher Powers 2010-07-01 WL#4896 "PERFORMANCE_SCHEMA Instrumenting Net IO" Fix build break. @ include/mysql/psi/mysql_socket.h Disable 'accept4' instrumentation modified: include/mysql/psi/mysql_socket.h 3150 Christopher Powers 2010-06-22 [merge] merge removed: BUILD/compile-alpha-ccc BUILD/compile-alpha-cxx mysql-test/include/ctype_innodb_like.inc mysql-test/include/have_innodb.inc mysql-test/include/innodb_trx_weight.inc mysql-test/include/show_slave_status2.inc mysql-test/r/innodb-autoinc.result mysql-test/r/innodb-consistent.result mysql-test/r/innodb-lock.result mysql-test/r/innodb-replace.result mysql-test/r/innodb-semi-consistent.result mysql-test/r/innodb.result mysql-test/r/innodb_bug21704.result mysql-test/r/innodb_bug34053.result mysql-test/r/innodb_bug34300.result mysql-test/r/innodb_bug35220.result mysql-test/r/innodb_bug38231.result mysql-test/r/innodb_bug39438.result mysql-test/r/innodb_bug40565.result mysql-test/r/innodb_bug42101-nonzero.result mysql-test/r/innodb_bug42101.result mysql-test/r/innodb_bug44369.result mysql-test/r/innodb_bug44571.result mysql-test/r/innodb_bug45357.result mysql-test/r/innodb_bug46000.result mysql-test/r/innodb_bug47777.result mysql-test/r/innodb_trx_weight.result mysql-test/suite/innodb/r/innodb-analyze.result mysql-test/suite/innodb/r/innodb-index.result mysql-test/suite/innodb/r/innodb-index_ucs2.result mysql-test/suite/innodb/r/innodb-timeout.result mysql-test/suite/innodb/r/innodb-use-sys-malloc.result mysql-test/suite/innodb/r/innodb-zip.result mysql-test/suite/innodb/r/innodb_bug36169.result mysql-test/suite/innodb/r/innodb_bug36172.result mysql-test/suite/innodb/r/innodb_bug40360.result mysql-test/suite/innodb/r/innodb_bug41904.result mysql-test/suite/innodb/r/innodb_bug44032.result mysql-test/suite/innodb/r/innodb_file_format.result mysql-test/suite/innodb/r/innodb_information_schema.result mysql-test/suite/innodb/t/innodb-analyze.test mysql-test/suite/innodb/t/innodb-index.test mysql-test/suite/innodb/t/innodb-index_ucs2.test mysql-test/suite/innodb/t/innodb-timeout.test mysql-test/suite/innodb/t/innodb-use-sys-malloc-master.opt mysql-test/suite/innodb/t/innodb-use-sys-malloc.test mysql-test/suite/innodb/t/innodb-zip.test mysql-test/suite/innodb/t/innodb_bug36169.test mysql-test/suite/innodb/t/innodb_bug36172.test mysql-test/suite/innodb/t/innodb_bug40360.test mysql-test/suite/innodb/t/innodb_bug41904.test mysql-test/suite/innodb/t/innodb_bug44032.test mysql-test/suite/innodb/t/innodb_file_format.test mysql-test/suite/innodb/t/innodb_information_schema.test mysql-test/suite/rpl/r/rpl_000015.result mysql-test/suite/rpl/t/rpl_000015-slave.opt mysql-test/suite/rpl/t/rpl_000015.cnf mysql-test/suite/rpl/t/rpl_000015.test mysql-test/t/innodb-autoinc.test mysql-test/t/innodb-consistent-master.opt mysql-test/t/innodb-consistent.test mysql-test/t/innodb-lock.test mysql-test/t/innodb-master.opt mysql-test/t/innodb-replace.test mysql-test/t/innodb-semi-consistent-master.opt mysql-test/t/innodb-semi-consistent.test mysql-test/t/innodb.test mysql-test/t/innodb_bug21704.test mysql-test/t/innodb_bug34053.test mysql-test/t/innodb_bug34300.test mysql-test/t/innodb_bug35220.test mysql-test/t/innodb_bug38231.test mysql-test/t/innodb_bug39438-master.opt mysql-test/t/innodb_bug39438.test mysql-test/t/innodb_bug40565.test mysql-test/t/innodb_bug42101-nonzero-master.opt mysql-test/t/innodb_bug42101-nonzero.test mysql-test/t/innodb_bug42101.test mysql-test/t/innodb_bug44369.test mysql-test/t/innodb_bug44571.test mysql-test/t/innodb_bug45357.test mysql-test/t/innodb_bug46000.test mysql-test/t/innodb_bug47777.test mysql-test/t/innodb_trx_weight.test mysys/make-ccc regex/make-ccc storage/heap/make-ccc storage/innobase/ storage/innobase/CMakeLists.txt storage/innobase/COPYING storage/innobase/COPYING.Google storage/innobase/COPYING.Percona storage/innobase/COPYING.Sun_Microsystems storage/innobase/ChangeLog storage/innobase/Doxyfile storage/innobase/Makefile.am storage/innobase/btr/ storage/innobase/btr/btr0btr.c storage/innobase/btr/btr0cur.c storage/innobase/btr/btr0pcur.c storage/innobase/btr/btr0sea.c storage/innobase/buf/ 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/compile-innodb storage/innobase/compile-innodb-debug storage/innobase/data/ storage/innobase/data/data0data.c storage/innobase/data/data0type.c storage/innobase/dict/ 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/dyn/ storage/innobase/dyn/dyn0dyn.c storage/innobase/eval/ storage/innobase/eval/eval0eval.c storage/innobase/eval/eval0proc.c storage/innobase/fil/ storage/innobase/fil/fil0fil.c storage/innobase/fsp/ storage/innobase/fsp/fsp0fsp.c storage/innobase/fut/ storage/innobase/fut/fut0fut.c storage/innobase/fut/fut0lst.c storage/innobase/ha/ storage/innobase/ha/ha0ha.c storage/innobase/ha/ha0storage.c storage/innobase/ha/hash0hash.c storage/innobase/ha_innodb.def storage/innobase/handler/ 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/handler/i_s.h storage/innobase/handler/mysql_addons.cc storage/innobase/ibuf/ storage/innobase/ibuf/ibuf0ibuf.c storage/innobase/include/ storage/innobase/include/btr0btr.h storage/innobase/include/btr0btr.ic storage/innobase/include/btr0cur.h storage/innobase/include/btr0cur.ic storage/innobase/include/btr0pcur.h storage/innobase/include/btr0pcur.ic storage/innobase/include/btr0sea.h storage/innobase/include/btr0sea.ic storage/innobase/include/btr0types.h storage/innobase/include/buf0buddy.h storage/innobase/include/buf0buddy.ic storage/innobase/include/buf0buf.h storage/innobase/include/buf0buf.ic storage/innobase/include/buf0flu.h storage/innobase/include/buf0flu.ic storage/innobase/include/buf0lru.h storage/innobase/include/buf0lru.ic storage/innobase/include/buf0rea.h storage/innobase/include/buf0types.h storage/innobase/include/data0data.h storage/innobase/include/data0data.ic storage/innobase/include/data0type.h storage/innobase/include/data0type.ic storage/innobase/include/data0types.h storage/innobase/include/db0err.h storage/innobase/include/dict0boot.h storage/innobase/include/dict0boot.ic storage/innobase/include/dict0crea.h storage/innobase/include/dict0crea.ic storage/innobase/include/dict0dict.h storage/innobase/include/dict0dict.ic storage/innobase/include/dict0load.h storage/innobase/include/dict0load.ic storage/innobase/include/dict0mem.h storage/innobase/include/dict0mem.ic storage/innobase/include/dict0types.h storage/innobase/include/dyn0dyn.h storage/innobase/include/dyn0dyn.ic storage/innobase/include/eval0eval.h storage/innobase/include/eval0eval.ic storage/innobase/include/eval0proc.h storage/innobase/include/eval0proc.ic storage/innobase/include/fil0fil.h storage/innobase/include/fsp0fsp.h storage/innobase/include/fsp0fsp.ic storage/innobase/include/fsp0types.h storage/innobase/include/fut0fut.h storage/innobase/include/fut0fut.ic storage/innobase/include/fut0lst.h storage/innobase/include/fut0lst.ic storage/innobase/include/ha0ha.h storage/innobase/include/ha0ha.ic storage/innobase/include/ha0storage.h storage/innobase/include/ha0storage.ic storage/innobase/include/ha_prototypes.h storage/innobase/include/handler0alter.h storage/innobase/include/hash0hash.h storage/innobase/include/hash0hash.ic storage/innobase/include/ibuf0ibuf.h storage/innobase/include/ibuf0ibuf.ic storage/innobase/include/ibuf0types.h storage/innobase/include/lock0iter.h storage/innobase/include/lock0lock.h storage/innobase/include/lock0lock.ic storage/innobase/include/lock0priv.h storage/innobase/include/lock0priv.ic storage/innobase/include/lock0types.h storage/innobase/include/log0log.h storage/innobase/include/log0log.ic storage/innobase/include/log0recv.h storage/innobase/include/log0recv.ic storage/innobase/include/mach0data.h storage/innobase/include/mach0data.ic storage/innobase/include/mem0dbg.h storage/innobase/include/mem0dbg.ic storage/innobase/include/mem0mem.h storage/innobase/include/mem0mem.ic storage/innobase/include/mem0pool.h storage/innobase/include/mem0pool.ic storage/innobase/include/mtr0log.h storage/innobase/include/mtr0log.ic storage/innobase/include/mtr0mtr.h storage/innobase/include/mtr0mtr.ic storage/innobase/include/mtr0types.h storage/innobase/include/mysql_addons.h storage/innobase/include/os0file.h storage/innobase/include/os0proc.h storage/innobase/include/os0proc.ic storage/innobase/include/os0sync.h storage/innobase/include/os0sync.ic storage/innobase/include/os0thread.h storage/innobase/include/os0thread.ic storage/innobase/include/page0cur.h storage/innobase/include/page0cur.ic storage/innobase/include/page0page.h storage/innobase/include/page0page.ic storage/innobase/include/page0types.h storage/innobase/include/page0zip.h storage/innobase/include/page0zip.ic storage/innobase/include/pars0grm.h storage/innobase/include/pars0opt.h storage/innobase/include/pars0opt.ic storage/innobase/include/pars0pars.h storage/innobase/include/pars0pars.ic storage/innobase/include/pars0sym.h storage/innobase/include/pars0sym.ic storage/innobase/include/pars0types.h storage/innobase/include/que0que.h storage/innobase/include/que0que.ic storage/innobase/include/que0types.h storage/innobase/include/read0read.h storage/innobase/include/read0read.ic storage/innobase/include/read0types.h storage/innobase/include/rem0cmp.h storage/innobase/include/rem0cmp.ic storage/innobase/include/rem0rec.h storage/innobase/include/rem0rec.ic storage/innobase/include/rem0types.h storage/innobase/include/row0ext.h storage/innobase/include/row0ext.ic storage/innobase/include/row0ins.h storage/innobase/include/row0ins.ic storage/innobase/include/row0merge.h storage/innobase/include/row0mysql.h storage/innobase/include/row0mysql.ic storage/innobase/include/row0purge.h storage/innobase/include/row0purge.ic storage/innobase/include/row0row.h storage/innobase/include/row0row.ic storage/innobase/include/row0sel.h storage/innobase/include/row0sel.ic storage/innobase/include/row0types.h storage/innobase/include/row0uins.h storage/innobase/include/row0uins.ic storage/innobase/include/row0umod.h storage/innobase/include/row0umod.ic storage/innobase/include/row0undo.h storage/innobase/include/row0undo.ic storage/innobase/include/row0upd.h storage/innobase/include/row0upd.ic storage/innobase/include/row0vers.h storage/innobase/include/row0vers.ic storage/innobase/include/srv0que.h storage/innobase/include/srv0srv.h storage/innobase/include/srv0srv.ic storage/innobase/include/srv0start.h storage/innobase/include/sync0arr.h storage/innobase/include/sync0arr.ic storage/innobase/include/sync0rw.h storage/innobase/include/sync0rw.ic storage/innobase/include/sync0sync.h storage/innobase/include/sync0sync.ic storage/innobase/include/sync0types.h storage/innobase/include/thr0loc.h storage/innobase/include/thr0loc.ic storage/innobase/include/trx0i_s.h storage/innobase/include/trx0purge.h storage/innobase/include/trx0purge.ic storage/innobase/include/trx0rec.h storage/innobase/include/trx0rec.ic storage/innobase/include/trx0roll.h storage/innobase/include/trx0roll.ic storage/innobase/include/trx0rseg.h storage/innobase/include/trx0rseg.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/trx0xa.h storage/innobase/include/univ.i storage/innobase/include/usr0sess.h storage/innobase/include/usr0sess.ic storage/innobase/include/usr0types.h storage/innobase/include/ut0auxconf.h storage/innobase/include/ut0byte.h storage/innobase/include/ut0byte.ic storage/innobase/include/ut0dbg.h storage/innobase/include/ut0list.h storage/innobase/include/ut0list.ic storage/innobase/include/ut0lst.h storage/innobase/include/ut0mem.h storage/innobase/include/ut0mem.ic storage/innobase/include/ut0rnd.h storage/innobase/include/ut0rnd.ic storage/innobase/include/ut0sort.h storage/innobase/include/ut0ut.h storage/innobase/include/ut0ut.ic storage/innobase/include/ut0vec.h storage/innobase/include/ut0vec.ic storage/innobase/include/ut0wqueue.h storage/innobase/lock/ storage/innobase/lock/lock0iter.c storage/innobase/lock/lock0lock.c storage/innobase/log/ storage/innobase/log/log0log.c storage/innobase/log/log0recv.c storage/innobase/mach/ storage/innobase/mach/mach0data.c storage/innobase/mem/ storage/innobase/mem/mem0dbg.c storage/innobase/mem/mem0mem.c storage/innobase/mem/mem0pool.c storage/innobase/mtr/ storage/innobase/mtr/mtr0log.c storage/innobase/mtr/mtr0mtr.c storage/innobase/mysql-test/ storage/innobase/mysql-test/ctype_innodb_like.inc storage/innobase/mysql-test/have_innodb.inc storage/innobase/mysql-test/innodb-analyze.result storage/innobase/mysql-test/innodb-analyze.test storage/innobase/mysql-test/innodb-autoinc.result storage/innobase/mysql-test/innodb-autoinc.test storage/innobase/mysql-test/innodb-consistent-master.opt storage/innobase/mysql-test/innodb-consistent.result storage/innobase/mysql-test/innodb-consistent.test storage/innobase/mysql-test/innodb-index.inc storage/innobase/mysql-test/innodb-index.result storage/innobase/mysql-test/innodb-index.test storage/innobase/mysql-test/innodb-index_ucs2.result storage/innobase/mysql-test/innodb-index_ucs2.test storage/innobase/mysql-test/innodb-lock.result storage/innobase/mysql-test/innodb-lock.test storage/innobase/mysql-test/innodb-master.opt storage/innobase/mysql-test/innodb-replace.result storage/innobase/mysql-test/innodb-replace.test storage/innobase/mysql-test/innodb-semi-consistent-master.opt storage/innobase/mysql-test/innodb-semi-consistent.result storage/innobase/mysql-test/innodb-semi-consistent.test storage/innobase/mysql-test/innodb-timeout.result storage/innobase/mysql-test/innodb-timeout.test storage/innobase/mysql-test/innodb-use-sys-malloc-master.opt storage/innobase/mysql-test/innodb-use-sys-malloc.result storage/innobase/mysql-test/innodb-use-sys-malloc.test storage/innobase/mysql-test/innodb-zip.result storage/innobase/mysql-test/innodb-zip.test storage/innobase/mysql-test/innodb.result storage/innobase/mysql-test/innodb.test storage/innobase/mysql-test/innodb_bug21704.result storage/innobase/mysql-test/innodb_bug21704.test storage/innobase/mysql-test/innodb_bug34053.result storage/innobase/mysql-test/innodb_bug34053.test storage/innobase/mysql-test/innodb_bug34300.result storage/innobase/mysql-test/innodb_bug34300.test storage/innobase/mysql-test/innodb_bug35220.result storage/innobase/mysql-test/innodb_bug35220.test storage/innobase/mysql-test/innodb_bug36169.result storage/innobase/mysql-test/innodb_bug36169.test storage/innobase/mysql-test/innodb_bug36172.result storage/innobase/mysql-test/innodb_bug36172.test storage/innobase/mysql-test/innodb_bug40360.result storage/innobase/mysql-test/innodb_bug40360.test storage/innobase/mysql-test/innodb_bug40565.result storage/innobase/mysql-test/innodb_bug40565.test storage/innobase/mysql-test/innodb_bug41904.result storage/innobase/mysql-test/innodb_bug41904.test storage/innobase/mysql-test/innodb_bug42101-nonzero-master.opt storage/innobase/mysql-test/innodb_bug42101-nonzero.result storage/innobase/mysql-test/innodb_bug42101-nonzero.test storage/innobase/mysql-test/innodb_bug42101.result storage/innobase/mysql-test/innodb_bug42101.test storage/innobase/mysql-test/innodb_bug44032.result storage/innobase/mysql-test/innodb_bug44032.test storage/innobase/mysql-test/innodb_bug44369.result storage/innobase/mysql-test/innodb_bug44369.test storage/innobase/mysql-test/innodb_bug44571.result storage/innobase/mysql-test/innodb_bug44571.test storage/innobase/mysql-test/innodb_bug45357.result storage/innobase/mysql-test/innodb_bug45357.test storage/innobase/mysql-test/innodb_bug46000.result storage/innobase/mysql-test/innodb_bug46000.test storage/innobase/mysql-test/innodb_file_format.result storage/innobase/mysql-test/innodb_file_format.test storage/innobase/mysql-test/innodb_information_schema.result storage/innobase/mysql-test/innodb_information_schema.test storage/innobase/mysql-test/innodb_trx_weight.inc storage/innobase/mysql-test/innodb_trx_weight.result storage/innobase/mysql-test/innodb_trx_weight.test storage/innobase/mysql-test/patches/ storage/innobase/mysql-test/patches/README storage/innobase/mysql-test/patches/index_merge_innodb-explain.diff storage/innobase/mysql-test/patches/information_schema.diff storage/innobase/mysql-test/patches/innodb-index.diff storage/innobase/mysql-test/patches/innodb_file_per_table.diff storage/innobase/mysql-test/patches/innodb_lock_wait_timeout.diff storage/innobase/mysql-test/patches/innodb_thread_concurrency_basic.diff storage/innobase/mysql-test/patches/partition_innodb.diff storage/innobase/os/ storage/innobase/os/os0file.c storage/innobase/os/os0proc.c storage/innobase/os/os0sync.c storage/innobase/os/os0thread.c storage/innobase/page/ storage/innobase/page/page0cur.c storage/innobase/page/page0page.c storage/innobase/page/page0zip.c storage/innobase/pars/ storage/innobase/pars/lexyy.c storage/innobase/pars/make_bison.sh storage/innobase/pars/make_flex.sh storage/innobase/pars/pars0grm.c storage/innobase/pars/pars0grm.y storage/innobase/pars/pars0lex.l storage/innobase/pars/pars0opt.c storage/innobase/pars/pars0pars.c storage/innobase/pars/pars0sym.c storage/innobase/plug.in storage/innobase/que/ storage/innobase/que/que0que.c storage/innobase/read/ storage/innobase/read/read0read.c storage/innobase/rem/ storage/innobase/rem/rem0cmp.c storage/innobase/rem/rem0rec.c storage/innobase/revert_gen.sh storage/innobase/row/ storage/innobase/row/row0ext.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/scripts/ storage/innobase/scripts/export.sh storage/innobase/scripts/install_innodb_plugins.sql storage/innobase/scripts/install_innodb_plugins_win.sql storage/innobase/setup.sh storage/innobase/srv/ storage/innobase/srv/srv0que.c storage/innobase/srv/srv0srv.c storage/innobase/srv/srv0start.c storage/innobase/sync/ storage/innobase/sync/sync0arr.c storage/innobase/sync/sync0rw.c storage/innobase/sync/sync0sync.c storage/innobase/thr/ storage/innobase/thr/thr0loc.c storage/innobase/trx/ 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/usr/ storage/innobase/usr/usr0sess.c storage/innobase/ut/ storage/innobase/ut/ut0auxconf_atomic_pthread_t_gcc.c storage/innobase/ut/ut0auxconf_atomic_pthread_t_solaris.c storage/innobase/ut/ut0auxconf_have_gcc_atomics.c storage/innobase/ut/ut0auxconf_have_solaris_atomics.c storage/innobase/ut/ut0auxconf_pause.c storage/innobase/ut/ut0auxconf_sizeof_pthread_t.c storage/innobase/ut/ut0byte.c storage/innobase/ut/ut0dbg.c storage/innobase/ut/ut0list.c storage/innobase/ut/ut0mem.c storage/innobase/ut/ut0rnd.c storage/innobase/ut/ut0ut.c storage/innobase/ut/ut0vec.c storage/innobase/ut/ut0wqueue.c storage/myisam/ft_eval.c storage/myisam/ft_eval.h storage/myisam/ft_stem.c storage/myisam/ft_test1.c storage/myisam/ft_test1.h storage/myisam/make-ccc storage/myisammrg/make-ccc strings/ChangeLog strings/bcopy-duff.c strings/bzero.c strings/macros.asm strings/make-ccc strings/memcmp.c strings/memcpy.c strings/memset.c strings/ptr_cmp.asm strings/strcat.c strings/strchr.c strings/strcmp.c strings/strings.asm strings/strlen.c strings/strrchr.c strings/strxmov.asm strings/udiv.c added: cmake/tags.cmake mysql-test/include/check_concurrent_insert.inc mysql-test/include/check_no_concurrent_insert.inc mysql-test/include/check_no_row_lock.inc mysql-test/include/check_shared_row_lock.inc mysql-test/include/check_slave_is_running.inc mysql-test/include/check_slave_no_error.inc mysql-test/include/check_slave_param.inc mysql-test/include/ctype_ascii_order.inc mysql-test/include/ctype_innodb_like.inc mysql-test/include/ctype_pad_space.inc mysql-test/include/get_relay_log_pos.inc mysql-test/include/have_innodb.inc mysql-test/include/innodb-index.inc mysql-test/include/innodb_trx_weight.inc mysql-test/include/mysqlhotcopy.inc mysql-test/include/not_parallel.inc mysql-test/include/show_events.inc mysql-test/include/weight_string.inc mysql-test/include/weight_string_8140.inc mysql-test/include/weight_string_8EA1.inc mysql-test/include/weight_string_8FA2C3.inc mysql-test/include/weight_string_A1A1.inc mysql-test/include/weight_string_chde.inc mysql-test/include/weight_string_euro.inc mysql-test/include/weight_string_l1.inc mysql-test/include/weight_string_l12.inc mysql-test/include/weight_string_l14.inc mysql-test/include/weight_string_l2.inc mysql-test/include/weight_string_l3.inc mysql-test/include/weight_string_l4.inc mysql-test/r/commit.result mysql-test/r/func_weight_string.result mysql-test/r/innodb_mysql_lock2.result mysql-test/r/mysqlhotcopy_archive.result mysql-test/r/mysqlhotcopy_myisam.result mysql-test/r/partition_binlog_stmt.result mysql-test/suite/binlog/r/binlog_spurious_ddl_errors.result mysql-test/suite/binlog/t/binlog_spurious_ddl_errors-master.opt mysql-test/suite/binlog/t/binlog_spurious_ddl_errors.test mysql-test/suite/innodb/r/innodb-analyze.result mysql-test/suite/innodb/r/innodb-autoinc-44030.result mysql-test/suite/innodb/r/innodb-autoinc.result mysql-test/suite/innodb/r/innodb-consistent.result mysql-test/suite/innodb/r/innodb-index.result mysql-test/suite/innodb/r/innodb-index_ucs2.result mysql-test/suite/innodb/r/innodb-lock.result mysql-test/suite/innodb/r/innodb-replace.result mysql-test/suite/innodb/r/innodb-semi-consistent.result mysql-test/suite/innodb/r/innodb-system-table-view.result mysql-test/suite/innodb/r/innodb-timeout.result mysql-test/suite/innodb/r/innodb-use-sys-malloc.result mysql-test/suite/innodb/r/innodb-zip.result mysql-test/suite/innodb/r/innodb.result mysql-test/suite/innodb/r/innodb_bug21704.result mysql-test/suite/innodb/r/innodb_bug34053.result mysql-test/suite/innodb/r/innodb_bug34300.result mysql-test/suite/innodb/r/innodb_bug35220.result mysql-test/suite/innodb/r/innodb_bug36169.result mysql-test/suite/innodb/r/innodb_bug36172.result mysql-test/suite/innodb/r/innodb_bug38231.result mysql-test/suite/innodb/r/innodb_bug39438.result mysql-test/suite/innodb/r/innodb_bug40360.result mysql-test/suite/innodb/r/innodb_bug40565.result mysql-test/suite/innodb/r/innodb_bug41904.result mysql-test/suite/innodb/r/innodb_bug42101-nonzero.result mysql-test/suite/innodb/r/innodb_bug42101.result mysql-test/suite/innodb/r/innodb_bug44032.result mysql-test/suite/innodb/r/innodb_bug44369.result mysql-test/suite/innodb/r/innodb_bug44571.result mysql-test/suite/innodb/r/innodb_bug45357.result mysql-test/suite/innodb/r/innodb_bug46000.result mysql-test/suite/innodb/r/innodb_bug47621.result mysql-test/suite/innodb/r/innodb_bug47622.result mysql-test/suite/innodb/r/innodb_bug47777.result mysql-test/suite/innodb/r/innodb_bug48024.result mysql-test/suite/innodb/r/innodb_bug49164.result mysql-test/suite/innodb/r/innodb_bug51378.result mysql-test/suite/innodb/r/innodb_bug51920.result mysql-test/suite/innodb/r/innodb_bug52663.result mysql-test/suite/innodb/r/innodb_bug52745.result mysql-test/suite/innodb/r/innodb_bug53290.result mysql-test/suite/innodb/r/innodb_bug53591.result mysql-test/suite/innodb/r/innodb_bug53592.result mysql-test/suite/innodb/r/innodb_bug53674.result mysql-test/suite/innodb/r/innodb_file_format.result mysql-test/suite/innodb/r/innodb_information_schema.result mysql-test/suite/innodb/r/innodb_multi_update.result mysql-test/suite/innodb/r/innodb_trx_weight.result mysql-test/suite/innodb/t/innodb-analyze.test mysql-test/suite/innodb/t/innodb-autoinc-44030-master.opt mysql-test/suite/innodb/t/innodb-autoinc-44030.test mysql-test/suite/innodb/t/innodb-autoinc-master.opt mysql-test/suite/innodb/t/innodb-autoinc.test mysql-test/suite/innodb/t/innodb-consistent-master.opt mysql-test/suite/innodb/t/innodb-consistent.test mysql-test/suite/innodb/t/innodb-index.test mysql-test/suite/innodb/t/innodb-index_ucs2.test mysql-test/suite/innodb/t/innodb-lock.test mysql-test/suite/innodb/t/innodb-master.opt mysql-test/suite/innodb/t/innodb-replace.test mysql-test/suite/innodb/t/innodb-semi-consistent-master.opt mysql-test/suite/innodb/t/innodb-semi-consistent.test mysql-test/suite/innodb/t/innodb-system-table-view-master.opt mysql-test/suite/innodb/t/innodb-system-table-view.test mysql-test/suite/innodb/t/innodb-timeout.test mysql-test/suite/innodb/t/innodb-use-sys-malloc-master.opt mysql-test/suite/innodb/t/innodb-use-sys-malloc.test mysql-test/suite/innodb/t/innodb-zip.test mysql-test/suite/innodb/t/innodb.test mysql-test/suite/innodb/t/innodb_bug21704.test mysql-test/suite/innodb/t/innodb_bug34053.test mysql-test/suite/innodb/t/innodb_bug34300.test mysql-test/suite/innodb/t/innodb_bug35220.test mysql-test/suite/innodb/t/innodb_bug36169.test mysql-test/suite/innodb/t/innodb_bug36172.test mysql-test/suite/innodb/t/innodb_bug38231.test mysql-test/suite/innodb/t/innodb_bug39438-master.opt mysql-test/suite/innodb/t/innodb_bug39438.test mysql-test/suite/innodb/t/innodb_bug40360.test mysql-test/suite/innodb/t/innodb_bug40565.test mysql-test/suite/innodb/t/innodb_bug41904.test mysql-test/suite/innodb/t/innodb_bug42101-nonzero-master.opt mysql-test/suite/innodb/t/innodb_bug42101-nonzero.test mysql-test/suite/innodb/t/innodb_bug42101.test mysql-test/suite/innodb/t/innodb_bug44032.test mysql-test/suite/innodb/t/innodb_bug44369.test mysql-test/suite/innodb/t/innodb_bug44571.test mysql-test/suite/innodb/t/innodb_bug45357.test mysql-test/suite/innodb/t/innodb_bug46000.test mysql-test/suite/innodb/t/innodb_bug47621.test mysql-test/suite/innodb/t/innodb_bug47622.test mysql-test/suite/innodb/t/innodb_bug47777.test mysql-test/suite/innodb/t/innodb_bug48024.test mysql-test/suite/innodb/t/innodb_bug49164.test mysql-test/suite/innodb/t/innodb_bug51378.test mysql-test/suite/innodb/t/innodb_bug51920.test mysql-test/suite/innodb/t/innodb_bug52663.test mysql-test/suite/innodb/t/innodb_bug52745.test mysql-test/suite/innodb/t/innodb_bug53290.test mysql-test/suite/innodb/t/innodb_bug53591.test mysql-test/suite/innodb/t/innodb_bug53592.test mysql-test/suite/innodb/t/innodb_bug53674-master.opt mysql-test/suite/innodb/t/innodb_bug53674.test mysql-test/suite/innodb/t/innodb_file_format.test mysql-test/suite/innodb/t/innodb_information_schema.test mysql-test/suite/innodb/t/innodb_multi_update.test mysql-test/suite/innodb/t/innodb_trx_weight.test mysql-test/suite/rpl/t/rpl_invoked_features-master.opt mysql-test/suite/rpl/t/rpl_mixed_row_innodb-master.opt mysql-test/suite/rpl/t/rpl_sync-master.opt mysql-test/suite/rpl/t/rpl_temp_temporary-master.opt mysql-test/suite/sys_vars/r/innodb_buffer_pool_instances_basic.result mysql-test/suite/sys_vars/r/innodb_purge_batch_size_basic.result mysql-test/suite/sys_vars/r/innodb_purge_threads_basic.result mysql-test/suite/sys_vars/r/innodb_use_native_aio_basic.result mysql-test/suite/sys_vars/t/innodb_buffer_pool_instances_basic.test mysql-test/suite/sys_vars/t/innodb_purge_batch_size_basic.test mysql-test/suite/sys_vars/t/innodb_purge_threads_basic.test mysql-test/suite/sys_vars/t/innodb_use_native_aio_basic.test mysql-test/t/bootstrap-master.opt mysql-test/t/commit.test mysql-test/t/ctype_utf8-master.opt mysql-test/t/ctype_utf8mb4-master.opt mysql-test/t/ctype_utf8mb4_innodb-master.opt mysql-test/t/func_weight_string.test mysql-test/t/implicit_commit-master.opt mysql-test/t/innodb_mysql_lock2.test mysql-test/t/lock_sync-master.opt mysql-test/t/mdl_sync-master.opt mysql-test/t/mysqldump-max-master.opt mysql-test/t/mysqlhotcopy_archive.test mysql-test/t/mysqlhotcopy_myisam.test mysql-test/t/partition_binlog_stmt.test mysql-test/t/ps_3innodb-master.opt mysql-test/t/strict-master.opt packaging/ packaging/WiX/ packaging/WiX/AdminBackground.jpg packaging/WiX/AdminHeader.jpg packaging/WiX/CMakeLists.txt packaging/WiX/CPackWixConfig.cmake packaging/WiX/MySQLServer.ico packaging/WiX/ca/ packaging/WiX/ca/CMakeLists.txt packaging/WiX/ca/CustomAction.cpp packaging/WiX/ca/CustomAction.def packaging/WiX/ca/CustomAction.rc packaging/WiX/create_msi.cmake.in packaging/WiX/extra.wxs.in packaging/WiX/mysql_server.wxs.in sql/datadict.cc sql/datadict.h sql/sql_truncate.cc sql/sql_truncate.h storage/innobase/ storage/innobase/CMakeLists.txt storage/innobase/COPYING storage/innobase/COPYING.Google storage/innobase/COPYING.Percona storage/innobase/COPYING.Sun_Microsystems storage/innobase/Doxyfile storage/innobase/Makefile.am storage/innobase/btr/ storage/innobase/btr/btr0btr.c storage/innobase/btr/btr0cur.c storage/innobase/btr/btr0pcur.c storage/innobase/btr/btr0sea.c storage/innobase/buf/ 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/compile-innodb storage/innobase/data/ storage/innobase/data/data0data.c storage/innobase/data/data0type.c storage/innobase/dict/ 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/dyn/ storage/innobase/dyn/dyn0dyn.c storage/innobase/eval/ storage/innobase/eval/eval0eval.c storage/innobase/eval/eval0proc.c storage/innobase/fil/ storage/innobase/fil/fil0fil.c storage/innobase/fsp/ storage/innobase/fsp/fsp0fsp.c storage/innobase/fut/ storage/innobase/fut/fut0fut.c storage/innobase/fut/fut0lst.c storage/innobase/ha/ storage/innobase/ha/ha0ha.c storage/innobase/ha/ha0storage.c storage/innobase/ha/hash0hash.c storage/innobase/ha_innodb.def storage/innobase/handler/ 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/handler/i_s.h storage/innobase/handler/mysql_addons.cc storage/innobase/ibuf/ storage/innobase/ibuf/ibuf0ibuf.c storage/innobase/include/ storage/innobase/include/btr0btr.h storage/innobase/include/btr0btr.ic storage/innobase/include/btr0cur.h storage/innobase/include/btr0cur.ic storage/innobase/include/btr0pcur.h storage/innobase/include/btr0pcur.ic storage/innobase/include/btr0sea.h storage/innobase/include/btr0sea.ic storage/innobase/include/btr0types.h storage/innobase/include/buf0buddy.h storage/innobase/include/buf0buddy.ic storage/innobase/include/buf0buf.h storage/innobase/include/buf0buf.ic storage/innobase/include/buf0flu.h storage/innobase/include/buf0flu.ic storage/innobase/include/buf0lru.h storage/innobase/include/buf0lru.ic storage/innobase/include/buf0rea.h storage/innobase/include/buf0types.h storage/innobase/include/data0data.h storage/innobase/include/data0data.ic storage/innobase/include/data0type.h storage/innobase/include/data0type.ic storage/innobase/include/data0types.h storage/innobase/include/db0err.h storage/innobase/include/dict0boot.h storage/innobase/include/dict0boot.ic storage/innobase/include/dict0crea.h storage/innobase/include/dict0crea.ic storage/innobase/include/dict0dict.h storage/innobase/include/dict0dict.ic storage/innobase/include/dict0load.h storage/innobase/include/dict0load.ic storage/innobase/include/dict0mem.h storage/innobase/include/dict0mem.ic storage/innobase/include/dict0types.h storage/innobase/include/dyn0dyn.h storage/innobase/include/dyn0dyn.ic storage/innobase/include/eval0eval.h storage/innobase/include/eval0eval.ic storage/innobase/include/eval0proc.h storage/innobase/include/eval0proc.ic storage/innobase/include/fil0fil.h storage/innobase/include/fsp0fsp.h storage/innobase/include/fsp0fsp.ic storage/innobase/include/fsp0types.h storage/innobase/include/fut0fut.h storage/innobase/include/fut0fut.ic storage/innobase/include/fut0lst.h storage/innobase/include/fut0lst.ic storage/innobase/include/ha0ha.h storage/innobase/include/ha0ha.ic storage/innobase/include/ha0storage.h storage/innobase/include/ha0storage.ic storage/innobase/include/ha_prototypes.h storage/innobase/include/handler0alter.h storage/innobase/include/hash0hash.h storage/innobase/include/hash0hash.ic storage/innobase/include/ibuf0ibuf.h storage/innobase/include/ibuf0ibuf.ic storage/innobase/include/ibuf0types.h storage/innobase/include/lock0iter.h storage/innobase/include/lock0lock.h storage/innobase/include/lock0lock.ic storage/innobase/include/lock0priv.h storage/innobase/include/lock0priv.ic storage/innobase/include/lock0types.h storage/innobase/include/log0log.h storage/innobase/include/log0log.ic storage/innobase/include/log0recv.h storage/innobase/include/log0recv.ic storage/innobase/include/mach0data.h storage/innobase/include/mach0data.ic storage/innobase/include/mem0dbg.h storage/innobase/include/mem0dbg.ic storage/innobase/include/mem0mem.h storage/innobase/include/mem0mem.ic storage/innobase/include/mem0pool.h storage/innobase/include/mem0pool.ic storage/innobase/include/mtr0log.h storage/innobase/include/mtr0log.ic storage/innobase/include/mtr0mtr.h storage/innobase/include/mtr0mtr.ic storage/innobase/include/mtr0types.h storage/innobase/include/mysql_addons.h storage/innobase/include/os0file.h storage/innobase/include/os0file.ic storage/innobase/include/os0proc.h storage/innobase/include/os0proc.ic storage/innobase/include/os0sync.h storage/innobase/include/os0sync.ic storage/innobase/include/os0thread.h storage/innobase/include/os0thread.ic storage/innobase/include/page0cur.h storage/innobase/include/page0cur.ic storage/innobase/include/page0page.h storage/innobase/include/page0page.ic storage/innobase/include/page0types.h storage/innobase/include/page0zip.h storage/innobase/include/page0zip.ic storage/innobase/include/pars0grm.h storage/innobase/include/pars0opt.h storage/innobase/include/pars0opt.ic storage/innobase/include/pars0pars.h storage/innobase/include/pars0pars.ic storage/innobase/include/pars0sym.h storage/innobase/include/pars0sym.ic storage/innobase/include/pars0types.h storage/innobase/include/que0que.h storage/innobase/include/que0que.ic storage/innobase/include/que0types.h storage/innobase/include/read0read.h storage/innobase/include/read0read.ic storage/innobase/include/read0types.h storage/innobase/include/rem0cmp.h storage/innobase/include/rem0cmp.ic storage/innobase/include/rem0rec.h storage/innobase/include/rem0rec.ic storage/innobase/include/rem0types.h storage/innobase/include/row0ext.h storage/innobase/include/row0ext.ic storage/innobase/include/row0ins.h storage/innobase/include/row0ins.ic storage/innobase/include/row0merge.h storage/innobase/include/row0mysql.h storage/innobase/include/row0mysql.ic storage/innobase/include/row0purge.h storage/innobase/include/row0purge.ic storage/innobase/include/row0row.h storage/innobase/include/row0row.ic storage/innobase/include/row0sel.h storage/innobase/include/row0sel.ic storage/innobase/include/row0types.h storage/innobase/include/row0uins.h storage/innobase/include/row0uins.ic storage/innobase/include/row0umod.h storage/innobase/include/row0umod.ic storage/innobase/include/row0undo.h storage/innobase/include/row0undo.ic storage/innobase/include/row0upd.h storage/innobase/include/row0upd.ic storage/innobase/include/row0vers.h storage/innobase/include/row0vers.ic storage/innobase/include/srv0srv.h storage/innobase/include/srv0srv.ic storage/innobase/include/srv0start.h storage/innobase/include/sync0arr.h storage/innobase/include/sync0arr.ic storage/innobase/include/sync0rw.h storage/innobase/include/sync0rw.ic storage/innobase/include/sync0sync.h storage/innobase/include/sync0sync.ic storage/innobase/include/sync0types.h storage/innobase/include/thr0loc.h storage/innobase/include/thr0loc.ic storage/innobase/include/trx0i_s.h storage/innobase/include/trx0purge.h storage/innobase/include/trx0purge.ic storage/innobase/include/trx0rec.h storage/innobase/include/trx0rec.ic storage/innobase/include/trx0roll.h storage/innobase/include/trx0roll.ic storage/innobase/include/trx0rseg.h storage/innobase/include/trx0rseg.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/trx0xa.h storage/innobase/include/univ.i storage/innobase/include/usr0sess.h storage/innobase/include/usr0sess.ic storage/innobase/include/usr0types.h storage/innobase/include/ut0auxconf.h storage/innobase/include/ut0byte.h storage/innobase/include/ut0byte.ic storage/innobase/include/ut0dbg.h storage/innobase/include/ut0list.h storage/innobase/include/ut0list.ic storage/innobase/include/ut0lst.h storage/innobase/include/ut0mem.h storage/innobase/include/ut0mem.ic storage/innobase/include/ut0rbt.h storage/innobase/include/ut0rnd.h storage/innobase/include/ut0rnd.ic storage/innobase/include/ut0sort.h storage/innobase/include/ut0ut.h storage/innobase/include/ut0ut.ic storage/innobase/include/ut0vec.h storage/innobase/include/ut0vec.ic storage/innobase/include/ut0wqueue.h storage/innobase/lock/ storage/innobase/lock/lock0iter.c storage/innobase/lock/lock0lock.c storage/innobase/log/ storage/innobase/log/log0log.c storage/innobase/log/log0recv.c storage/innobase/mach/ storage/innobase/mach/mach0data.c storage/innobase/mem/ storage/innobase/mem/mem0dbg.c storage/innobase/mem/mem0mem.c storage/innobase/mem/mem0pool.c storage/innobase/mtr/ storage/innobase/mtr/mtr0log.c storage/innobase/mtr/mtr0mtr.c storage/innobase/mysql-test/ storage/innobase/mysql-test/patches/ storage/innobase/mysql-test/patches/README storage/innobase/mysql-test/patches/index_merge_innodb-explain.diff storage/innobase/mysql-test/patches/information_schema.diff storage/innobase/mysql-test/patches/innodb_change_buffering_basic.diff storage/innobase/mysql-test/patches/innodb_file_per_table.diff storage/innobase/mysql-test/patches/innodb_lock_wait_timeout.diff storage/innobase/mysql-test/patches/innodb_thread_concurrency_basic.diff storage/innobase/mysql-test/patches/partition_innodb.diff storage/innobase/os/ storage/innobase/os/os0file.c storage/innobase/os/os0proc.c storage/innobase/os/os0sync.c storage/innobase/os/os0thread.c storage/innobase/page/ storage/innobase/page/page0cur.c storage/innobase/page/page0page.c storage/innobase/page/page0zip.c storage/innobase/pars/ storage/innobase/pars/lexyy.c storage/innobase/pars/make_bison.sh storage/innobase/pars/make_flex.sh storage/innobase/pars/pars0grm.c storage/innobase/pars/pars0grm.y storage/innobase/pars/pars0lex.l storage/innobase/pars/pars0opt.c storage/innobase/pars/pars0pars.c storage/innobase/pars/pars0sym.c storage/innobase/plug.in storage/innobase/que/ storage/innobase/que/que0que.c storage/innobase/read/ storage/innobase/read/read0read.c storage/innobase/rem/ storage/innobase/rem/rem0cmp.c storage/innobase/rem/rem0rec.c storage/innobase/row/ storage/innobase/row/row0ext.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/ storage/innobase/srv/srv0srv.c storage/innobase/srv/srv0start.c storage/innobase/sync/ storage/innobase/sync/sync0arr.c storage/innobase/sync/sync0rw.c storage/innobase/sync/sync0sync.c storage/innobase/thr/ storage/innobase/thr/thr0loc.c storage/innobase/trx/ 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/usr/ storage/innobase/usr/usr0sess.c storage/innobase/ut/ storage/innobase/ut/ut0auxconf_atomic_pthread_t_gcc.c storage/innobase/ut/ut0auxconf_atomic_pthread_t_solaris.c storage/innobase/ut/ut0auxconf_have_gcc_atomics.c storage/innobase/ut/ut0auxconf_have_solaris_atomics.c storage/innobase/ut/ut0auxconf_pause.c storage/innobase/ut/ut0auxconf_sizeof_pthread_t.c storage/innobase/ut/ut0byte.c storage/innobase/ut/ut0dbg.c storage/innobase/ut/ut0list.c storage/innobase/ut/ut0mem.c storage/innobase/ut/ut0rbt.c storage/innobase/ut/ut0rnd.c storage/innobase/ut/ut0ut.c storage/innobase/ut/ut0vec.c storage/innobase/ut/ut0wqueue.c renamed: mysql-test/r/innodb-autoinc-optimize.result => mysql-test/suite/innodb/r/innodb-autoinc-optimize.result mysql-test/r/innodb-ucs2.result => mysql-test/suite/innodb/r/innodb-ucs2.result mysql-test/r/innodb_autoinc_lock_mode_zero.result => mysql-test/suite/innodb/r/innodb_autoinc_lock_mode_zero.result mysql-test/r/innodb_bug30919.result => mysql-test/suite/innodb/r/innodb_bug30919.result mysql-test/r/innodb_bug42419.result => mysql-test/suite/innodb/r/innodb_bug42419.result mysql-test/r/innodb_gis.result => mysql-test/suite/innodb/r/innodb_gis.result mysql-test/r/innodb_lock_wait_timeout_1.result => mysql-test/suite/innodb/r/innodb_lock_wait_timeout_1.result mysql-test/r/innodb_mysql.result => mysql-test/suite/innodb/r/innodb_mysql.result mysql-test/r/innodb_mysql_rbk.result => mysql-test/suite/innodb/r/innodb_mysql_rbk.result mysql-test/r/innodb_notembedded.result => mysql-test/suite/innodb/r/innodb_notembedded.result mysql-test/r/innodb_timeout_rollback.result => mysql-test/suite/innodb/r/innodb_timeout_rollback.result mysql-test/suite/rpl/r/rpl_row_disabled_slave_key.result => mysql-test/suite/rpl/r/rpl_row_find_row.result mysql-test/suite/rpl/t/rpl_row_disabled_slave_key.test => mysql-test/suite/rpl/t/rpl_row_find_row.test mysql-test/t/innodb-autoinc-optimize.test => mysql-test/suite/innodb/t/innodb-autoinc-optimize.test mysql-test/t/innodb-ucs2.test => mysql-test/suite/innodb/t/innodb-ucs2.test mysql-test/t/innodb_autoinc_lock_mode_zero-master.opt => mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero-master.opt mysql-test/t/innodb_autoinc_lock_mode_zero.test => mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test mysql-test/t/innodb_bug30919-master.opt => mysql-test/suite/innodb/t/innodb_bug30919-master.opt mysql-test/t/innodb_bug30919.test => mysql-test/suite/innodb/t/innodb_bug30919.test mysql-test/t/innodb_bug42419.test => mysql-test/suite/innodb/t/innodb_bug42419.test mysql-test/t/innodb_gis.test => mysql-test/suite/innodb/t/innodb_gis.test mysql-test/t/innodb_lock_wait_timeout_1-master.opt => mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1-master.opt mysql-test/t/innodb_lock_wait_timeout_1.test => mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test mysql-test/t/innodb_mysql-master.opt => mysql-test/suite/innodb/t/innodb_mysql-master.opt mysql-test/t/innodb_mysql.test => mysql-test/suite/innodb/t/innodb_mysql.test mysql-test/t/innodb_mysql_rbk-master.opt => mysql-test/suite/innodb/t/innodb_mysql_rbk-master.opt mysql-test/t/innodb_mysql_rbk.test => mysql-test/suite/innodb/t/innodb_mysql_rbk.test mysql-test/t/innodb_notembedded.test => mysql-test/suite/innodb/t/innodb_notembedded.test mysql-test/t/innodb_timeout_rollback-master.opt => mysql-test/suite/innodb/t/innodb_timeout_rollback-master.opt mysql-test/t/innodb_timeout_rollback.test => mysql-test/suite/innodb/t/innodb_timeout_rollback.test mysys/my_messnc.c => mysys/my_mess.c modified: .bzrignore BUILD/Makefile.am BUILD/SETUP.sh BUILD/build_mccge.sh BUILD/compile-amd64-valgrind-max BUILD/compile-pentium-icc-valgrind-max BUILD/compile-pentium-valgrind-max BUILD/compile-pentium-valgrind-max-no-ndb BUILD/compile-pentium64-valgrind-max CMakeLists.txt client/CMakeLists.txt client/Makefile.am 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/Makefile.am cmake/configure.pl cmake/create_initial_db.cmake.in cmake/install_macros.cmake cmake/libutils.cmake cmake/mysql_add_executable.cmake cmake/os/FreeBSD.cmake cmake/package_name.cmake cmake/plugin.cmake cmake/ssl.cmake cmd-line-utils/libedit/filecomplete.c cmd-line-utils/readline/input.c config.h.cmake config/ac-macros/ssl.m4 configure.cmake configure.in dbug/Makefile.am extra/CMakeLists.txt extra/Makefile.am extra/comp_err.c extra/my_print_defaults.c extra/mysql_waitpid.c extra/perror.c extra/resolve_stack_dump.c extra/resolveip.c extra/yassl/certs/ca-cert.pem extra/yassl/certs/client-cert.der extra/yassl/certs/client-cert.pem extra/yassl/certs/dsa-cert.pem extra/yassl/certs/server-cert.pem extra/yassl/include/lock.hpp extra/yassl/src/Makefile.am extra/yassl/src/lock.cpp extra/yassl/taocrypt/benchmark/Makefile.am extra/yassl/taocrypt/include/runtime.hpp extra/yassl/taocrypt/src/Makefile.am extra/yassl/taocrypt/test/Makefile.am extra/yassl/taocrypt/test/memory.cpp extra/yassl/testsuite/Makefile.am include/CMakeLists.txt include/heap.h include/m_ctype.h include/m_string.h include/my_alloc.h include/my_base.h include/my_getopt.h include/my_global.h include/my_pthread.h include/my_sys.h include/mysql.h.pp include/mysql_com.h include/sslopt-longopts.h include/thr_lock.h include/typelib.h libmysql/CMakeLists.txt libmysql/Makefile.shared libmysqld/CMakeLists.txt libmysqld/Makefile.am libmysqld/lib_sql.cc mysql-test/CMakeLists.txt mysql-test/collections/default.experimental mysql-test/extra/binlog_tests/binlog.test mysql-test/extra/binlog_tests/binlog_truncate.test mysql-test/extra/binlog_tests/blackhole.test mysql-test/extra/rpl_tests/rpl_deadlock.test mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test mysql-test/extra/rpl_tests/rpl_flsh_tbls.test mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test mysql-test/extra/rpl_tests/rpl_insert_delayed.test mysql-test/extra/rpl_tests/rpl_log.test mysql-test/extra/rpl_tests/rpl_max_relay_size.test mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test mysql-test/extra/rpl_tests/rpl_reset_slave.test mysql-test/extra/rpl_tests/rpl_row_basic.test mysql-test/extra/rpl_tests/rpl_row_tabledefs.test mysql-test/extra/rpl_tests/rpl_show_relaylog_events.inc mysql-test/include/ctype_german.inc mysql-test/include/mix1.inc mysql-test/include/not_var_link.inc mysql-test/include/rpl_stmt_seq.inc mysql-test/include/show_binlog_events.inc mysql-test/include/show_relaylog_events.inc mysql-test/include/show_rpl_debug_info.inc mysql-test/include/show_slave_status.inc mysql-test/include/test_fieldsize.inc mysql-test/include/wait_for_binlog_event.inc mysql-test/include/wait_for_slave_io_error.inc mysql-test/include/wait_for_slave_param.inc mysql-test/include/wait_for_slave_sql_error.inc mysql-test/include/wait_for_slave_sql_error_and_skip.inc mysql-test/include/wait_for_status_var.inc mysql-test/include/wait_until_count_sessions.inc mysql-test/lib/My/SafeProcess/CMakeLists.txt mysql-test/lib/mtr_cases.pm mysql-test/lib/mtr_misc.pl mysql-test/lib/v1/mtr_process.pl mysql-test/mysql-test-run.pl mysql-test/r/alter_table-big.result mysql-test/r/alter_table.result mysql-test/r/archive.result mysql-test/r/bug39022.result mysql-test/r/bug46760.result mysql-test/r/create-big.result mysql-test/r/create.result mysql-test/r/ctype_big5.result mysql-test/r/ctype_cp1250_ch.result mysql-test/r/ctype_cp1251.result mysql-test/r/ctype_cp932_binlog_stm.result mysql-test/r/ctype_eucjpms.result* mysql-test/r/ctype_euckr.result mysql-test/r/ctype_gb2312.result mysql-test/r/ctype_gbk.result mysql-test/r/ctype_latin1.result mysql-test/r/ctype_latin1_de.result mysql-test/r/ctype_latin2.result mysql-test/r/ctype_latin2_ch.result mysql-test/r/ctype_sjis.result mysql-test/r/ctype_tis620.result mysql-test/r/ctype_uca.result mysql-test/r/ctype_ucs.result mysql-test/r/ctype_ujis.result mysql-test/r/ctype_utf16.result mysql-test/r/ctype_utf16_uca.result mysql-test/r/ctype_utf32.result mysql-test/r/ctype_utf32_uca.result mysql-test/r/ctype_utf8.result mysql-test/r/ctype_utf8mb4.result mysql-test/r/ctype_utf8mb4_heap.result mysql-test/r/ctype_utf8mb4_innodb.result mysql-test/r/ctype_utf8mb4_myisam.result mysql-test/r/ctype_utf8mb4_ndb.result mysql-test/r/drop.result mysql-test/r/error_simulation.result mysql-test/r/errors.result mysql-test/r/explain.result mysql-test/r/flush_block_commit_notembedded.result mysql-test/r/func_isnull.result mysql-test/r/greedy_optimizer.result mysql-test/r/group_min_max.result mysql-test/r/handler_myisam.result mysql-test/r/information_schema_part.result mysql-test/r/innodb_mysql_lock.result mysql-test/r/join_outer.result mysql-test/r/loaddata.result mysql-test/r/locale.result mysql-test/r/lock_sync.result mysql-test/r/mdl_sync.result mysql-test/r/merge.result mysql-test/r/multi_update.result mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/r/mysqlshow.result mysql-test/r/order_by.result mysql-test/r/parser_not_embedded.result mysql-test/r/partition.result mysql-test/r/partition_column.result mysql-test/r/partition_error.result mysql-test/r/partition_innodb.result mysql-test/r/partition_innodb_semi_consistent.result mysql-test/r/ps.result mysql-test/r/rename.result mysql-test/r/show_check.result mysql-test/r/sp_sync.result mysql-test/r/sp_trans_log.result mysql-test/r/subselect4.result mysql-test/r/truncate.result mysql-test/r/truncate_coverage.result mysql-test/r/type_binary.result mysql-test/r/type_decimal.result mysql-test/r/type_time.result mysql-test/r/variables.result mysql-test/r/view.result mysql-test/suite/binlog/r/binlog_innodb.result mysql-test/suite/binlog/r/binlog_multi_engine.result mysql-test/suite/binlog/r/binlog_row_binlog.result mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result mysql-test/suite/binlog/r/binlog_stm_binlog.result mysql-test/suite/binlog/r/binlog_stm_blackhole.result mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result mysql-test/suite/binlog/r/binlog_switch_inside_trans.result mysql-test/suite/binlog/r/binlog_truncate_innodb.result mysql-test/suite/binlog/r/binlog_truncate_myisam.result mysql-test/suite/binlog/t/binlog_innodb.test mysql-test/suite/binlog/t/binlog_row_binlog-master.opt mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam-master.opt mysql-test/suite/binlog/t/binlog_stm_binlog-master.opt mysql-test/suite/binlog/t/binlog_stm_binlog.test mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam-master.opt mysql-test/suite/binlog/t/binlog_switch_inside_trans.test mysql-test/suite/binlog/t/binlog_truncate_innodb.test mysql-test/suite/binlog/t/binlog_truncate_myisam.test mysql-test/suite/binlog/t/binlog_unsafe.test mysql-test/suite/binlog/t/disabled.def mysql-test/suite/bugs/r/rpl_bug12691.result mysql-test/suite/bugs/r/rpl_bug36391.result mysql-test/suite/bugs/t/rpl_bug12691.test mysql-test/suite/bugs/t/rpl_bug36391.test mysql-test/suite/engines/funcs/r/rpl_000015.result mysql-test/suite/engines/funcs/r/rpl_REDIRECT.result mysql-test/suite/engines/funcs/r/rpl_change_master.result mysql-test/suite/engines/funcs/r/rpl_empty_master_crash.result mysql-test/suite/engines/funcs/r/rpl_flushlog_loop.result mysql-test/suite/engines/funcs/r/rpl_loaddata_s.result mysql-test/suite/engines/funcs/r/rpl_log_pos.result mysql-test/suite/engines/funcs/r/rpl_rbr_to_sbr.result mysql-test/suite/engines/funcs/r/rpl_row_drop.result mysql-test/suite/engines/funcs/r/rpl_row_inexist_tbl.result mysql-test/suite/engines/funcs/r/rpl_row_max_relay_size.result mysql-test/suite/engines/funcs/r/rpl_row_reset_slave.result mysql-test/suite/engines/funcs/r/rpl_row_until.result mysql-test/suite/engines/funcs/r/rpl_server_id1.result mysql-test/suite/engines/funcs/r/rpl_server_id2.result mysql-test/suite/engines/funcs/r/rpl_slave_status.result mysql-test/suite/engines/funcs/r/rpl_stm_max_relay_size.result mysql-test/suite/engines/funcs/r/rpl_stm_reset_slave.result mysql-test/suite/engines/funcs/r/rpl_switch_stm_row_mixed.result mysql-test/suite/engines/funcs/t/rpl_000015.test mysql-test/suite/engines/funcs/t/rpl_REDIRECT.test mysql-test/suite/engines/funcs/t/rpl_change_master.test mysql-test/suite/engines/funcs/t/rpl_empty_master_crash.test mysql-test/suite/engines/funcs/t/rpl_flushlog_loop.test mysql-test/suite/engines/funcs/t/rpl_loaddata_s.test mysql-test/suite/engines/funcs/t/rpl_log_pos.test mysql-test/suite/engines/funcs/t/rpl_rbr_to_sbr.test mysql-test/suite/engines/funcs/t/rpl_row_drop.test mysql-test/suite/engines/funcs/t/rpl_row_inexist_tbl.test mysql-test/suite/engines/funcs/t/rpl_row_until.test mysql-test/suite/engines/funcs/t/rpl_server_id1.test mysql-test/suite/engines/funcs/t/rpl_server_id2.test mysql-test/suite/engines/funcs/t/rpl_slave_status.test mysql-test/suite/engines/funcs/t/rpl_switch_stm_row_mixed.test mysql-test/suite/federated/federated_plugin-master.opt mysql-test/suite/federated/federated_plugin.test mysql-test/suite/funcs_1/r/innodb_views.result mysql-test/suite/funcs_1/r/is_engines_innodb.result mysql-test/suite/funcs_1/r/memory_views.result mysql-test/suite/funcs_1/r/myisam_views.result mysql-test/suite/funcs_1/r/ndb_views.result mysql-test/suite/funcs_1/views/func_view.inc mysql-test/suite/funcs_1/views/views_master.inc mysql-test/suite/innodb/r/innodb_bug47167.result mysql-test/suite/innodb/t/disabled.def mysql-test/suite/innodb/t/innodb_bug47167.test mysql-test/suite/manual/r/rpl_replication_delay.result mysql-test/suite/manual/t/rpl_replication_delay.test mysql-test/suite/ndb/r/ndb_binlog_format.result mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result mysql-test/suite/parts/inc/partition_auto_increment.inc mysql-test/suite/parts/r/partition_alter3_innodb.result mysql-test/suite/parts/r/partition_auto_increment_archive.result mysql-test/suite/parts/r/partition_auto_increment_blackhole.result mysql-test/suite/parts/r/partition_auto_increment_innodb.result mysql-test/suite/parts/r/partition_auto_increment_memory.result mysql-test/suite/parts/r/partition_auto_increment_myisam.result mysql-test/suite/parts/r/partition_auto_increment_ndb.result mysql-test/suite/parts/r/partition_basic_innodb.result mysql-test/suite/parts/r/rpl_partition.result mysql-test/suite/parts/t/partition_auto_increment_archive.test mysql-test/suite/parts/t/partition_auto_increment_blackhole.test mysql-test/suite/parts/t/rpl_partition.test mysql-test/suite/perfschema/include/binlog_common.inc mysql-test/suite/perfschema/include/cleanup_helper.inc mysql-test/suite/perfschema/include/privilege.inc mysql-test/suite/perfschema/include/setup_helper.inc mysql-test/suite/perfschema/include/start_server_common.inc mysql-test/suite/perfschema/r/dml_setup_instruments.result mysql-test/suite/perfschema/t/aggregate.test mysql-test/suite/perfschema/t/bad_option_1.test mysql-test/suite/perfschema/t/bad_option_2.test mysql-test/suite/perfschema/t/binlog_mix.test mysql-test/suite/perfschema/t/binlog_row.test mysql-test/suite/perfschema/t/binlog_stmt.test mysql-test/suite/perfschema/t/cnf_option.cnf mysql-test/suite/perfschema/t/cnf_option.test mysql-test/suite/perfschema/t/column_privilege.test mysql-test/suite/perfschema/t/ddl_cond_instances.test mysql-test/suite/perfschema/t/ddl_events_waits_current.test mysql-test/suite/perfschema/t/ddl_events_waits_history.test mysql-test/suite/perfschema/t/ddl_events_waits_history_long.test mysql-test/suite/perfschema/t/ddl_ews_by_event_name.test mysql-test/suite/perfschema/t/ddl_ews_by_instance.test mysql-test/suite/perfschema/t/ddl_ews_by_thread_by_event_name.test mysql-test/suite/perfschema/t/ddl_file_instances.test mysql-test/suite/perfschema/t/ddl_fs_by_event_name.test mysql-test/suite/perfschema/t/ddl_fs_by_instance.test mysql-test/suite/perfschema/t/ddl_mutex_instances.test mysql-test/suite/perfschema/t/ddl_performance_timers.test mysql-test/suite/perfschema/t/ddl_processlist.test mysql-test/suite/perfschema/t/ddl_rwlock_instances.test mysql-test/suite/perfschema/t/ddl_setup_consumers.test mysql-test/suite/perfschema/t/ddl_setup_instruments.test mysql-test/suite/perfschema/t/ddl_setup_objects.test mysql-test/suite/perfschema/t/ddl_setup_timers.test mysql-test/suite/perfschema/t/disabled.def mysql-test/suite/perfschema/t/dml_cond_instances.test mysql-test/suite/perfschema/t/dml_events_waits_current.test mysql-test/suite/perfschema/t/dml_events_waits_history.test mysql-test/suite/perfschema/t/dml_events_waits_history_long.test mysql-test/suite/perfschema/t/dml_ews_by_event_name.test mysql-test/suite/perfschema/t/dml_ews_by_instance.test mysql-test/suite/perfschema/t/dml_ews_by_thread_by_event_name.test mysql-test/suite/perfschema/t/dml_file_instances.test mysql-test/suite/perfschema/t/dml_file_summary_by_event_name.test mysql-test/suite/perfschema/t/dml_file_summary_by_instance.test mysql-test/suite/perfschema/t/dml_mutex_instances.test mysql-test/suite/perfschema/t/dml_performance_timers.test mysql-test/suite/perfschema/t/dml_processlist.test mysql-test/suite/perfschema/t/dml_rwlock_instances.test mysql-test/suite/perfschema/t/dml_setup_consumers.test mysql-test/suite/perfschema/t/dml_setup_instruments.test mysql-test/suite/perfschema/t/dml_setup_objects.test mysql-test/suite/perfschema/t/dml_setup_timers.test mysql-test/suite/perfschema/t/func_file_io.test mysql-test/suite/perfschema/t/func_mutex.test mysql-test/suite/perfschema/t/global_read_lock.test mysql-test/suite/perfschema/t/information_schema.test mysql-test/suite/perfschema/t/myisam_file_io.test mysql-test/suite/perfschema/t/no_threads-master.opt mysql-test/suite/perfschema/t/no_threads.test mysql-test/suite/perfschema/t/one_thread_per_con.test mysql-test/suite/perfschema/t/pfs_upgrade.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/schema.test mysql-test/suite/perfschema/t/selects.test mysql-test/suite/perfschema/t/server_init.test mysql-test/suite/perfschema/t/start_server_no_cond_class.test mysql-test/suite/perfschema/t/start_server_no_cond_inst.test mysql-test/suite/perfschema/t/start_server_no_file_class.test mysql-test/suite/perfschema/t/start_server_no_file_inst.test mysql-test/suite/perfschema/t/start_server_no_mutex_class.test mysql-test/suite/perfschema/t/start_server_no_mutex_inst.test mysql-test/suite/perfschema/t/start_server_no_rwlock_class.test mysql-test/suite/perfschema/t/start_server_no_rwlock_inst.test mysql-test/suite/perfschema/t/start_server_no_thread_class.test mysql-test/suite/perfschema/t/start_server_no_thread_inst.test mysql-test/suite/perfschema/t/start_server_off.test mysql-test/suite/perfschema/t/start_server_on.test mysql-test/suite/perfschema/t/tampered_perfschema_table1.test mysql-test/suite/rpl/include/rpl_mixed_ddl.inc mysql-test/suite/rpl/include/rpl_mixed_dml.inc mysql-test/suite/rpl/r/rpl_binlog_grant.result mysql-test/suite/rpl/r/rpl_bug33931.result mysql-test/suite/rpl/r/rpl_change_master.result mysql-test/suite/rpl/r/rpl_concurrency_error.result mysql-test/suite/rpl/r/rpl_deadlock_innodb.result mysql-test/suite/rpl/r/rpl_dual_pos_advance.result mysql-test/suite/rpl/r/rpl_extraCol_innodb.result mysql-test/suite/rpl/r/rpl_extraCol_myisam.result mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result mysql-test/suite/rpl/r/rpl_flushlog_loop.result mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result mysql-test/suite/rpl/r/rpl_grant.result mysql-test/suite/rpl/r/rpl_heartbeat.result mysql-test/suite/rpl/r/rpl_incident.result mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result mysql-test/suite/rpl/r/rpl_known_bugs_detection.result mysql-test/suite/rpl/r/rpl_loaddata_fatal.result mysql-test/suite/rpl/r/rpl_log_pos.result mysql-test/suite/rpl/r/rpl_mix_insert_delayed.result mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result mysql-test/suite/rpl/r/rpl_replicate_do.result mysql-test/suite/rpl/r/rpl_rotate_logs.result mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result mysql-test/suite/rpl/r/rpl_row_colSize.result mysql-test/suite/rpl/r/rpl_row_create_table.result mysql-test/suite/rpl/r/rpl_row_drop.result mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result mysql-test/suite/rpl/r/rpl_row_loaddata_concurrent.result mysql-test/suite/rpl/r/rpl_row_log.result mysql-test/suite/rpl/r/rpl_row_log_innodb.result mysql-test/suite/rpl/r/rpl_row_max_relay_size.result mysql-test/suite/rpl/r/rpl_row_reset_slave.result mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result mysql-test/suite/rpl/r/rpl_row_until.result mysql-test/suite/rpl/r/rpl_skip_error.result mysql-test/suite/rpl/r/rpl_slave_skip.result mysql-test/suite/rpl/r/rpl_sp.result mysql-test/suite/rpl/r/rpl_ssl.result mysql-test/suite/rpl/r/rpl_ssl1.result mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result mysql-test/suite/rpl/r/rpl_stm_innodb.result mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result mysql-test/suite/rpl/r/rpl_stm_log.result mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result mysql-test/suite/rpl/r/rpl_stm_reset_slave.result mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result mysql-test/suite/rpl/r/rpl_stm_until.result mysql-test/suite/rpl/r/rpl_temp_temporary.result mysql-test/suite/rpl/r/rpl_temporary_errors.result mysql-test/suite/rpl/t/rpl_binlog_grant.test mysql-test/suite/rpl/t/rpl_bug33931.test mysql-test/suite/rpl/t/rpl_change_master.test mysql-test/suite/rpl/t/rpl_critical_errors.test mysql-test/suite/rpl/t/rpl_dual_pos_advance.test mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test mysql-test/suite/rpl/t/rpl_flushlog_loop.test mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test mysql-test/suite/rpl/t/rpl_grant.test mysql-test/suite/rpl/t/rpl_heartbeat.test mysql-test/suite/rpl/t/rpl_incident.test mysql-test/suite/rpl/t/rpl_known_bugs_detection.test mysql-test/suite/rpl/t/rpl_loaddata_fatal.test mysql-test/suite/rpl/t/rpl_log_pos.test mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test mysql-test/suite/rpl/t/rpl_replicate_do.test mysql-test/suite/rpl/t/rpl_rotate_logs.test mysql-test/suite/rpl/t/rpl_row_basic_11bugs-master.opt mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test mysql-test/suite/rpl/t/rpl_row_binlog_max_cache_size-master.opt mysql-test/suite/rpl/t/rpl_row_create_table.test mysql-test/suite/rpl/t/rpl_row_drop.test mysql-test/suite/rpl/t/rpl_row_log_innodb-master.opt mysql-test/suite/rpl/t/rpl_row_until.test mysql-test/suite/rpl/t/rpl_semi_sync.test mysql-test/suite/rpl/t/rpl_skip_error.test mysql-test/suite/rpl/t/rpl_slave_skip.test mysql-test/suite/rpl/t/rpl_sp.test mysql-test/suite/rpl/t/rpl_ssl.test mysql-test/suite/rpl/t/rpl_ssl1.test mysql-test/suite/rpl/t/rpl_stm_loaddata_concurrent.test mysql-test/suite/rpl/t/rpl_stm_until.test mysql-test/suite/rpl/t/rpl_sync-slave.opt mysql-test/suite/rpl/t/rpl_temp_temporary.test mysql-test/suite/rpl/t/rpl_temporary_errors.test mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors.test mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test mysql-test/suite/rpl_ndb/t/rpl_ndb_idempotent.test mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test mysql-test/suite/sys_vars/r/all_vars.result mysql-test/suite/sys_vars/r/default_storage_engine_basic.result mysql-test/suite/sys_vars/r/innodb_change_buffering_basic.result mysql-test/suite/sys_vars/r/innodb_file_format_basic.result mysql-test/suite/sys_vars/r/innodb_file_format_check_basic.result mysql-test/suite/sys_vars/r/innodb_strict_mode_basic.result mysql-test/suite/sys_vars/r/lc_time_names_basic.result mysql-test/suite/sys_vars/r/optimizer_search_depth_basic.result mysql-test/suite/sys_vars/r/slow_query_log_func.result mysql-test/suite/sys_vars/r/storage_engine_basic.result mysql-test/suite/sys_vars/r/tx_isolation_func.result mysql-test/suite/sys_vars/t/default_storage_engine_basic.test mysql-test/suite/sys_vars/t/identity_func.test mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func.test mysql-test/suite/sys_vars/t/innodb_change_buffering_basic.test mysql-test/suite/sys_vars/t/innodb_file_format_check_basic.test mysql-test/suite/sys_vars/t/last_insert_id_func.test mysql-test/suite/sys_vars/t/lc_time_names_basic.test mysql-test/suite/sys_vars/t/optimizer_search_depth_basic.test mysql-test/suite/sys_vars/t/slow_query_log_func.test mysql-test/suite/sys_vars/t/storage_engine_basic.test mysql-test/suite/sys_vars/t/tx_isolation_func.test mysql-test/t/alter_table-big.test mysql-test/t/alter_table.test mysql-test/t/archive.test mysql-test/t/archive_plugin-master.opt mysql-test/t/archive_plugin.test mysql-test/t/blackhole_plugin-master.opt mysql-test/t/blackhole_plugin.test mysql-test/t/bootstrap.test mysql-test/t/bug39022.test mysql-test/t/bug46760.test mysql-test/t/crash_commit_before-master.opt mysql-test/t/create-big.test mysql-test/t/create.test mysql-test/t/ctype_big5.test mysql-test/t/ctype_cp1250_ch.test mysql-test/t/ctype_cp1251.test mysql-test/t/ctype_cp932_binlog_stm.test mysql-test/t/ctype_eucjpms.test mysql-test/t/ctype_euckr.test mysql-test/t/ctype_gb2312.test mysql-test/t/ctype_gbk.test mysql-test/t/ctype_latin1.test mysql-test/t/ctype_latin1_de.test mysql-test/t/ctype_latin2.test mysql-test/t/ctype_latin2_ch.test mysql-test/t/ctype_sjis.test mysql-test/t/ctype_tis620.test mysql-test/t/ctype_uca.test mysql-test/t/ctype_ucs.test mysql-test/t/ctype_ujis.test mysql-test/t/ctype_utf16.test mysql-test/t/ctype_utf16_uca.test mysql-test/t/ctype_utf32.test mysql-test/t/ctype_utf32_uca.test mysql-test/t/ctype_utf8.test mysql-test/t/ctype_utf8mb4.test mysql-test/t/disabled.def mysql-test/t/drop.test mysql-test/t/error_simulation.test mysql-test/t/errors.test mysql-test/t/explain.test mysql-test/t/flush_block_commit_notembedded.test mysql-test/t/func_isnull.test mysql-test/t/greedy_optimizer.test mysql-test/t/group_min_max.test mysql-test/t/handler_myisam.test mysql-test/t/innodb_mysql_lock.test mysql-test/t/join_outer.test mysql-test/t/loaddata.test mysql-test/t/locale.test mysql-test/t/lock_sync.test mysql-test/t/mdl_sync.test mysql-test/t/merge.test mysql-test/t/multi_update.test mysql-test/t/order_by.test mysql-test/t/parser_not_embedded.test mysql-test/t/partition.test mysql-test/t/partition_column.test mysql-test/t/partition_error.test mysql-test/t/partition_innodb.test mysql-test/t/partition_innodb_semi_consistent-master.opt mysql-test/t/partition_innodb_semi_consistent.test mysql-test/t/ps_3innodb.test mysql-test/t/rename.test mysql-test/t/show_check.test mysql-test/t/sp_sync.test mysql-test/t/sp_trans_log.test mysql-test/t/subselect4.test mysql-test/t/truncate.test mysql-test/t/truncate_coverage.test mysql-test/t/type_decimal.test mysql-test/t/type_time.test mysql-test/t/variables.test mysql-test/t/view.test mysql-test/valgrind.supp mysys/CMakeLists.txt mysys/Makefile.am mysys/charset-def.c mysys/charset.c mysys/lf_alloc-pin.c mysys/mf_wfile.c mysys/my_alloc.c mysys/my_gethwaddr.c mysys/my_getopt.c mysys/my_init.c mysys/my_malloc.c mysys/my_pthread.c mysys/my_static.c mysys/safemalloc.c mysys/thr_lock.c netware/Makefile.am plugin/audit_null/CMakeLists.txt plugin/daemon_example/CMakeLists.txt plugin/daemon_example/daemon_example.cc plugin/semisync/semisync_master.cc plugin/semisync/semisync_master.h plugin/semisync/semisync_master_plugin.cc plugin/semisync/semisync_slave_plugin.cc regex/Makefile.am scripts/CMakeLists.txt scripts/make_binary_distribution.sh scripts/mysqld_safe.sh sql/CMakeLists.txt sql/Makefile.am sql/debug_sync.cc sql/derror.cc sql/event_data_objects.cc sql/event_scheduler.cc sql/field.cc sql/field.h sql/filesort.cc sql/ha_ndbcluster.cc sql/ha_ndbcluster.h sql/ha_ndbcluster_binlog.cc sql/ha_partition.cc sql/ha_partition.h sql/handler.cc sql/handler.h sql/init.cc sql/item.cc sql/item.h sql/item_cmpfunc.cc sql/item_cmpfunc.h sql/item_strfunc.cc sql/item_strfunc.h sql/item_subselect.cc sql/item_sum.cc sql/item_sum.h sql/key.cc sql/lex.h sql/lock.cc sql/lock.h sql/log.cc sql/log.h sql/log_event.cc sql/log_event.h sql/log_event_old.cc sql/mdl.cc sql/mdl.h sql/mysqld.cc sql/mysqld.h sql/net_serv.cc sql/opt_range.cc sql/opt_range.h sql/opt_sum.cc sql/partition_info.cc sql/partition_info.h sql/protocol.cc sql/repl_failsafe.cc sql/rpl_handler.cc sql/rpl_mi.cc sql/rpl_utility.h sql/share/CMakeLists.txt sql/share/errmsg-utf8.txt sql/slave.cc sql/sp.cc sql/sp.h sql/sp_head.cc sql/sp_head.h sql/spatial.cc sql/spatial.h sql/sql_acl.cc sql/sql_base.cc sql/sql_base.h sql/sql_bitmap.h sql/sql_cache.cc sql/sql_class.cc sql/sql_class.h sql/sql_connect.cc sql/sql_const.h sql/sql_cursor.cc sql/sql_db.cc sql/sql_delete.cc sql/sql_delete.h sql/sql_derived.cc sql/sql_handler.cc sql/sql_handler.h sql/sql_insert.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_list.h sql/sql_load.cc sql/sql_locale.cc sql/sql_manager.cc sql/sql_olap.cc sql/sql_parse.cc sql/sql_parse.h sql/sql_partition.cc sql/sql_partition.h sql/sql_plist.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_show.cc sql/sql_string.cc sql/sql_table.cc sql/sql_test.cc sql/sql_test.h sql/sql_trigger.cc sql/sql_udf.cc sql/sql_union.cc sql/sql_update.cc sql/sql_view.cc sql/sql_view.h sql/sql_yacc.yy sql/sys_vars.cc sql/sys_vars.h sql/table.cc sql/table.h sql/thr_malloc.cc sql/thr_malloc.h sql/transaction.cc sql/tztime.cc sql/unireg.cc storage/archive/Makefile.am storage/archive/archive_reader.c storage/archive/ha_archive.cc storage/heap/CMakeLists.txt storage/heap/Makefile.am storage/heap/ha_heap.cc storage/heap/hp_create.c storage/heap/hp_open.c storage/heap/hp_test1.c storage/heap/hp_test2.c storage/myisam/CMakeLists.txt storage/myisam/Makefile.am storage/myisam/ft_nlq_search.c storage/myisam/fulltext.h storage/myisam/mi_create.c storage/myisam/mi_dbug.c storage/myisam/mi_open.c storage/myisam/mi_page.c storage/myisam/mi_search.c storage/myisam/mi_test1.c storage/myisam/myisam_ftdump.c storage/myisam/myisamchk.c storage/myisam/myisamlog.c storage/myisam/myisampack.c storage/myisammrg/ha_myisammrg.cc storage/myisammrg/myrg_queue.c storage/ndb/config/type_ndbapitest.mk.am storage/ndb/config/type_ndbapitools.mk.am storage/ndb/src/Makefile.am storage/ndb/src/common/util/Makefile.am storage/ndb/src/common/util/NdbSqlUtil.cpp storage/ndb/src/cw/cpcd/Makefile.am storage/ndb/src/kernel/Makefile.am storage/ndb/src/kernel/blocks/Makefile.am storage/ndb/src/kernel/blocks/backup/Makefile.am storage/ndb/src/kernel/blocks/dbdict/Makefile.am storage/ndb/src/kernel/blocks/dbdih/Makefile.am storage/ndb/src/kernel/blocks/dblqh/Makefile.am storage/ndb/src/kernel/blocks/dbtup/Makefile.am storage/ndb/src/kernel/vm/Makefile.am storage/ndb/src/mgmclient/Makefile.am storage/ndb/src/mgmsrv/Makefile.am storage/ndb/src/ndbapi/Makefile.am storage/ndb/test/run-test/Makefile.am storage/perfschema/ha_perfschema.cc storage/perfschema/ha_perfschema.h storage/perfschema/pfs.cc storage/perfschema/pfs.h storage/perfschema/pfs_atomic.cc storage/perfschema/pfs_atomic.h storage/perfschema/pfs_check.cc storage/perfschema/pfs_column_types.h storage/perfschema/pfs_column_values.cc storage/perfschema/pfs_column_values.h storage/perfschema/pfs_engine_table.cc storage/perfschema/pfs_engine_table.h storage/perfschema/pfs_events_waits.cc storage/perfschema/pfs_events_waits.h storage/perfschema/pfs_global.cc storage/perfschema/pfs_global.h storage/perfschema/pfs_instr.cc storage/perfschema/pfs_instr.h storage/perfschema/pfs_instr_class.cc storage/perfschema/pfs_instr_class.h storage/perfschema/pfs_lock.h storage/perfschema/pfs_server.cc storage/perfschema/pfs_server.h storage/perfschema/pfs_stat.h storage/perfschema/pfs_timer.cc storage/perfschema/pfs_timer.h storage/perfschema/plug.in storage/perfschema/table_all_instr.cc storage/perfschema/table_all_instr.h storage/perfschema/table_events_waits.cc storage/perfschema/table_events_waits.h storage/perfschema/table_events_waits_summary.cc storage/perfschema/table_events_waits_summary.h storage/perfschema/table_file_instances.cc storage/perfschema/table_file_instances.h storage/perfschema/table_file_summary.cc storage/perfschema/table_file_summary.h storage/perfschema/table_performance_timers.cc storage/perfschema/table_performance_timers.h storage/perfschema/table_processlist.cc storage/perfschema/table_processlist.h storage/perfschema/table_setup_consumers.cc storage/perfschema/table_setup_consumers.h storage/perfschema/table_setup_instruments.cc storage/perfschema/table_setup_instruments.h storage/perfschema/table_setup_objects.cc storage/perfschema/table_setup_objects.h storage/perfschema/table_setup_timers.cc storage/perfschema/table_setup_timers.h storage/perfschema/table_sync_instances.cc storage/perfschema/table_sync_instances.h storage/perfschema/unittest/Makefile.am storage/perfschema/unittest/conf.txt storage/perfschema/unittest/pfs-t.cc storage/perfschema/unittest/pfs_instr-oom-t.cc storage/perfschema/unittest/pfs_instr-t.cc storage/perfschema/unittest/pfs_instr_class-oom-t.cc storage/perfschema/unittest/pfs_instr_class-t.cc storage/perfschema/unittest/pfs_timer-t.cc storage/perfschema/unittest/stub_pfs_global.h storage/perfschema/unittest/stub_print_error.h strings/Makefile.am strings/conf_to_src.c strings/ctype-big5.c strings/ctype-bin.c strings/ctype-cp932.c strings/ctype-czech.c strings/ctype-euc_kr.c strings/ctype-eucjpms.c strings/ctype-extra.c strings/ctype-gb2312.c strings/ctype-gbk.c strings/ctype-latin1.c strings/ctype-mb.c strings/ctype-simple.c strings/ctype-sjis.c strings/ctype-tis620.c strings/ctype-uca.c strings/ctype-ucs2.c strings/ctype-ujis.c strings/ctype-utf8.c strings/ctype-win1250ch.c strings/decimal.c strings/dtoa.c support-files/CMakeLists.txt support-files/mysql.spec.sh tests/CMakeLists.txt tests/mysql_client_test.c unittest/examples/Makefile.am unittest/mysys/Makefile.am unittest/mytap/t/Makefile.am vio/viosocket.c mysql-test/suite/innodb/r/innodb_mysql.result mysql-test/suite/rpl/r/rpl_row_find_row.result mysql-test/suite/rpl/t/rpl_row_find_row.test mysql-test/suite/innodb/t/innodb_mysql-master.opt mysql-test/suite/innodb/t/innodb_mysql.test mysys/my_mess.c === modified file 'include/mysql/psi/mysql_socket.h' --- a/include/mysql/psi/mysql_socket.h 2010-06-22 23:02:37 +0000 +++ b/include/mysql/psi/mysql_socket.h 2010-07-01 21:25:57 +0000 @@ -235,6 +235,8 @@ inline_mysql_end_socket_wait(struct PSI_ inline_mysql_socket_accept(SD, A, LP) #endif +#if 0 + #ifdef HAVE_PSI_INTERFACE #define mysql_socket_accept4(SD, A, LP, FL) \ inline_mysql_socket_accept4(__FILE__, __LINE__, SD, A, LP, FL) @@ -243,6 +245,8 @@ inline_mysql_end_socket_wait(struct PSI_ inline_mysql_socket_accept4(SD, A, LP, FL) #endif +#endif + #ifdef HAVE_PSI_INTERFACE #define mysql_socket_close(SD) \ inline_mysql_socket_close(__FILE__, __LINE__, SD) @@ -743,6 +747,7 @@ inline_mysql_socket_accept } /** mysql_socket_accept4 */ +#if 0 static inline MYSQL_SOCKET inline_mysql_socket_accept4 @@ -771,6 +776,10 @@ inline_mysql_socket_accept4 return result; } +#endif + + + /** mysql_socket_close */ static inline int --===============7592254792042796212== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/chris.powers@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chris.powers@stripped # target_branch: file:///home/cpowers/work/dev/base-wl4896/mysql/ # testament_sha1: ec2d71f3f5836619e180f7cfa40307af1ec3edf4 # timestamp: 2010-07-01 16:26:31 -0500 # source_branch: bzr+ssh://cpowers@stripped/bzrroot\ # /server/mysql-next-mr/ # base_revision_id: chris.powers@stripped\ # eat0wr2v1do2r49s # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWZHNNkAAbDfgGAQWOP/939n 2IC////wUAO+k0KatqAA01AlNom9UP1TTTymamIGj1NAPUbUP1J+ppAZTUnkaYgaTJGIDQAZMjQZ BoBzCYBMAJhMJpgAAEyaaBjmEwCYATCYTTAAAJk00DCSQCExNJskxGjEp+Qp6aTyE09RoGm1P0eH pc09G2I0f30fcYlpHLp0a60jVWOfFtcYOL6XXnrOSUH18JJkz2BYwnKV1OW4tL2sle6dcrd0I/rN HJMUFlMImFUe8K6lBLMwGhgnpH4co30kEHOEcmbJRVM6idFQkkbKI3JF9lUjTfnkV3uF2stTOe9C wiyFeJ7QzjEFFKAwuKcb34qqpf3M7CUOjbULFeUbc4nm6pA54h9tb24Fyg6XAtkosvpiZgzdP14j omtRWb8asO/Td1O/FiyNyytEty3ZhMiAWsHU1B7RYYThnSywsiGuBxF1jjJTTyncqlVmDFV4J8bH Z2T9qc6Zu8VDDtzLd5DivRPC4i3rwjpuopvblQmZ4ld86mT6xPN4UtAmtajSCOePcMUTSJq46Mnh 5wmRo+kLWCmNQxYyaVikFSlgwiLBIUjEWKgxK2VLfUhbOLYTuoapQdPQM9FttjSzRzV0pCW4VLLu Yq64k7rMdNVy6DlUq2sa2t+a9Gl7QszNVVKJAnKEFF1GcTCNGu8Dqxq2ZPIz+2ftRBEOE5BHzs29 gbslHbeVAXX262XXQW63c9b8ZoYMfR5yR4vDWu0f+fH3q+3h6JFsBwO+t98K5otmmczdWDScfHWN NZrxWPmyDlToCS8B66t7Bb5qbAU82EDxGIFV19fkQhIl2EhjQc3Cgjxz1BW0xHM8rsc04Ji7GMOQ V1TOB81VprzJLPo6bj6H2yN/vOhXKJ4c+mLc3XEw4d/survlS7ikltrVveq71N3JtFAiPgoWPvuw 0wAOXK47PciMAGqMg2xuLeB49ZM7+PJvLaMOIifn5C6wteLB2QXKqWPXJI9rhddRWai75cGTQyOw Y1i8OlETV0YhfXGP/a5yzkmOeCR78Qd2fWXhhfvFs7GFb1C1h8O/13BaFrk/8Mju1UcZkhlbqw5q yXxEOTVrJUmWFZlOMD0b1cznSijdJ6MCDl06Xe0Q+DJ7JlwO5doqa0aMQU0fB51+6QwVrxcs9Bf1 BI1bcdTMDyZHySNkdmzLww0peah1MXpvkrklvIozb9BPjuBUWp+nbJCjE+blhFI83JEX6Cc1buYs sJg6i7XI+iVSjMMw2EHshyqZ/3LXOswOUjDCwpBqkMDEHLNIXxz1Y376ivUnWKIRReJrAVFy8Vdk qKtRW9LCRH/xdyRThQkGZHNNkA== --===============7592254792042796212==--