3048 Georgi Kodinov 2010-06-07 [merge]
merge and typo fix
modified:
sql/sql_parse.cc
sql/sys_vars.cc
3047 Alexander Nozdrin 2010-06-07 [merge]
Manual merge from mysql-trunk-bugfixing.
Conflicts:
- BUILD/SETUP.sh
- mysql-test/mysql-test-run.pl
- mysql-test/r/partition_error.result
- mysql-test/t/disabled.def
- mysql-test/t/partition_error.test
- sql/share/errmsg-utf8.txt
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/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/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/ctype_innodb_like.inc
mysql-test/include/have_innodb.inc
mysql-test/include/innodb-index.inc
mysql-test/include/innodb_trx_weight.inc
mysql-test/r/innodb_mysql_lock2.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.test
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.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/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/innodb_mysql_lock2.test
mysql-test/t/partition_binlog_stmt.test
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:
mysys/my_messnc.c => mysys/my_mess.c
modified:
.bzr-mysql/default.conf
.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/mysql.cc
client/mysqltest.cc
client/sql_string.cc
cmake/Makefile.am
cmake/os/FreeBSD.cmake
cmd-line-utils/libedit/filecomplete.c
cmd-line-utils/readline/input.c
config.h.cmake
configure.cmake
configure.in
extra/comp_err.c
extra/perror.c
extra/yassl/taocrypt/include/runtime.hpp
include/m_string.h
include/my_alloc.h
include/my_base.h
include/my_global.h
include/my_pthread.h
include/my_sys.h
include/mysql_com.h
libmysql/Makefile.shared
libmysqld/lib_sql.cc
mysql-test/include/not_var_link.inc
mysql-test/mysql-test-run.pl
mysql-test/r/alter_table.result
mysql-test/r/bug39022.result
mysql-test/r/create.result
mysql-test/r/ctype_utf16.result
mysql-test/r/ctype_utf32.result
mysql-test/r/ctype_utf8.result
mysql-test/r/ctype_utf8mb4.result
mysql-test/r/errors.result
mysql-test/r/information_schema_part.result
mysql-test/r/innodb_mysql_lock.result
mysql-test/r/lock_sync.result
mysql-test/r/mdl_sync.result
mysql-test/r/merge.result
mysql-test/r/mysqlshow.result
mysql-test/r/order_by.result
mysql-test/r/partition.result
mysql-test/r/partition_column.result
mysql-test/r/partition_error.result
mysql-test/r/show_check.result
mysql-test/r/type_binary.result
mysql-test/r/type_decimal.result
mysql-test/suite/binlog/r/binlog_multi_engine.result
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.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/t/binlog_switch_inside_trans.test
mysql-test/suite/binlog/t/disabled.def
mysql-test/suite/innodb/t/disabled.def
mysql-test/suite/ndb/r/ndb_binlog_format.result
mysql-test/suite/perfschema/r/dml_setup_instruments.result
mysql-test/suite/rpl/r/rpl_concurrency_error.result
mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result
mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result
mysql-test/suite/rpl/r/rpl_temp_temporary.result
mysql-test/suite/rpl/t/rpl_semi_sync.test
mysql-test/suite/rpl/t/rpl_temp_temporary.test
mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result
mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors.test
mysql-test/suite/sys_vars/r/innodb_change_buffering_basic.result
mysql-test/suite/sys_vars/r/tx_isolation_func.result
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/last_insert_id_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.test
mysql-test/t/bug39022.test
mysql-test/t/create.test
mysql-test/t/ctype_utf16.test
mysql-test/t/ctype_utf32.test
mysql-test/t/ctype_utf8.test
mysql-test/t/ctype_utf8mb4.test
mysql-test/t/disabled.def
mysql-test/t/errors.test
mysql-test/t/innodb_mysql_lock.test
mysql-test/t/lock_sync.test
mysql-test/t/mdl_sync.test
mysql-test/t/merge.test
mysql-test/t/order_by.test
mysql-test/t/partition.test
mysql-test/t/partition_column.test
mysql-test/t/partition_error.test
mysql-test/t/ps_3innodb.test
mysql-test/t/show_check.test
mysql-test/t/type_decimal.test
mysql-test/valgrind.supp
mysys/CMakeLists.txt
mysys/Makefile.am
mysys/lf_alloc-pin.c
mysys/my_gethwaddr.c
mysys/my_init.c
mysys/my_pthread.c
mysys/my_static.c
mysys/safemalloc.c
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
sql/debug_sync.cc
sql/derror.cc
sql/field.cc
sql/field.h
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.h
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_sum.cc
sql/item_sum.h
sql/key.cc
sql/lock.cc
sql/lock.h
sql/log.cc
sql/log_event.cc
sql/log_event.h
sql/mdl.h
sql/mysqld.cc
sql/mysqld.h
sql/opt_range.cc
sql/opt_range.h
sql/partition_info.cc
sql/partition_info.h
sql/protocol.cc
sql/rpl_handler.cc
sql/rpl_mi.cc
sql/rpl_utility.h
sql/share/errmsg-utf8.txt
sql/sp_head.cc
sql/spatial.cc
sql/spatial.h
sql/sql_acl.cc
sql/sql_base.cc
sql/sql_base.h
sql/sql_cache.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_const.h
sql/sql_delete.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_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_update.cc
sql/sql_yacc.yy
sql/sys_vars.cc
sql/table.cc
sql/table.h
sql/thr_malloc.cc
sql/thr_malloc.h
sql/transaction.cc
storage/myisam/CMakeLists.txt
storage/myisam/Makefile.am
storage/myisam/mi_create.c
storage/myisam/mi_open.c
storage/myisam/mi_page.c
storage/myisam/mi_search.c
storage/myisammrg/ha_myisammrg.cc
storage/myisammrg/myrg_queue.c
storage/perfschema/pfs.cc
storage/perfschema/pfs_instr.cc
storage/perfschema/pfs_instr_class.cc
storage/perfschema/pfs_server.cc
strings/ctype-ucs2.c
strings/dtoa.c
support-files/mysql.spec.sh
vio/viosocket.c
mysys/my_mess.c
=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc 2010-06-07 08:47:04 +0000
+++ b/sql/sql_parse.cc 2010-06-07 10:37:11 +0000
@@ -1353,8 +1353,11 @@ bool dispatch_command(enum enum_server_c
SHUTDOWN_DEFAULT is 0. If client is >= 4.1.3, the shutdown level is in
packet[0].
*/
- enum mysql_enum_shutdown_level level=
- (enum mysql_enum_shutdown_level) (uchar) packet[0];
+ enum mysql_enum_shutdown_level level;
+ if (!thd->is_valid_time())
+ level= SHUTDOWN_DEFAULT;
+ else
+ level= (enum mysql_enum_shutdown_level) (uchar) packet[0];
if (level == SHUTDOWN_DEFAULT)
level= SHUTDOWN_WAIT_ALL_BUFFERS; // soon default will be configurable
else if (level != SHUTDOWN_WAIT_ALL_BUFFERS)
=== modified file 'sql/sys_vars.cc'
--- a/sql/sys_vars.cc 2010-06-07 08:47:04 +0000
+++ b/sql/sys_vars.cc 2010-06-07 10:37:11 +0000
@@ -2405,8 +2405,8 @@ static Sys_var_session_special Sys_times
"timestamp", "Set the time for this client",
sys_var::ONLY_SESSION, NO_CMD_LINE,
VALID_RANGE(0, ~(time_t)0), BLOCK_SIZE(1),
- NO_MUTEX_GUARD, IN_BINLOG, ON_CHECK(0), ON_UPDATE(update_timestamp),
- ON_READ(read_timestamp));
+ NO_MUTEX_GUARD, IN_BINLOG, ON_CHECK(check_timestamp),
+ ON_UPDATE(update_timestamp), ON_READ(read_timestamp));
static bool update_last_insert_id(THD *thd, set_var *var)
{
Attachment: [text/bzr-bundle] bzr/georgi.kodinov@oracle.com-20100607103711-1ewweehcwcnoz91e.bundle
| Thread |
|---|
| • bzr push into mysql-trunk-bugfixing branch (Georgi.Kodinov:3047 to 3048) | Georgi Kodinov | 7 Jun |
