List:Commits« Previous MessageNext Message »
From:Bjorn Munch Date:November 22 2011 12:18pm
Subject:bzr push into mysql-trunk branch (bjorn.munch:3137 to 3138)
View as plain text  
 3138 Bjorn Munch	2011-11-22 [merge]
      merge trunk => trunk-mtr

    removed:
      mysql-test/extra/rpl_tests/rpl_parallel_benchmark_load.test
      mysql-test/r/disabled_partition.require
      mysql-test/r/not_partition.require
      mysql-test/suite/rpl/r/rpl_parallel_benchmark.result
      mysql-test/suite/rpl/t/rpl_parallel_benchmark-master.opt
      mysql-test/suite/rpl/t/rpl_parallel_benchmark-slave.opt
      mysql-test/suite/rpl/t/rpl_parallel_benchmark.test
      storage/innobase/include/srv0conc.h
      storage/innobase/srv/srv0conc.c
    added:
      mysql-test/include/have_innodb_16k.inc
      mysql-test/include/have_innodb_4k.inc
      mysql-test/include/have_innodb_8k.inc
      mysql-test/suite/binlog/r/binlog_hexdump.result
      mysql-test/suite/binlog/std_data/bug11747887-bin.000003
      mysql-test/suite/binlog/t/binlog_hexdump.test
      mysql-test/suite/innodb/r/innodb-ac-non-locking-select.result
      mysql-test/suite/innodb/r/innodb-restart.result
      mysql-test/suite/innodb/r/innodb_16k.result
      mysql-test/suite/innodb/r/innodb_4k.result
      mysql-test/suite/innodb/r/innodb_8k.result
      mysql-test/suite/innodb/r/innodb_bug12661768.result
      mysql-test/suite/innodb/r/innodb_cmp_drop_table.result
      mysql-test/suite/innodb/r/innodb_index_large_prefix_4k.result
      mysql-test/suite/innodb/r/innodb_index_large_prefix_8k.result
      mysql-test/suite/innodb/r/innodb_misc1.result
      mysql-test/suite/innodb/r/innodb_replace.result
      mysql-test/suite/innodb/t/innodb-ac-non-locking-select.test
      mysql-test/suite/innodb/t/innodb-restart.test
      mysql-test/suite/innodb/t/innodb_16k.test
      mysql-test/suite/innodb/t/innodb_4k.test
      mysql-test/suite/innodb/t/innodb_8k.test
      mysql-test/suite/innodb/t/innodb_bug12661768.test
      mysql-test/suite/innodb/t/innodb_cmp_drop_table-master.opt
      mysql-test/suite/innodb/t/innodb_cmp_drop_table.test
      mysql-test/suite/innodb/t/innodb_index_large_prefix_4k.test
      mysql-test/suite/innodb/t/innodb_index_large_prefix_8k.test
      mysql-test/suite/innodb/t/innodb_misc1-master.opt
      mysql-test/suite/innodb/t/innodb_misc1.test
      mysql-test/suite/innodb/t/innodb_replace.test
      mysql-test/suite/innodb_fts/
      mysql-test/suite/innodb_fts/r/
      mysql-test/suite/innodb_fts/r/fulltext.result
      mysql-test/suite/innodb_fts/r/fulltext2.result
      mysql-test/suite/innodb_fts/r/fulltext3.result
      mysql-test/suite/innodb_fts/r/fulltext_cache.result
      mysql-test/suite/innodb_fts/r/fulltext_distinct.result
      mysql-test/suite/innodb_fts/r/fulltext_left_join.result
      mysql-test/suite/innodb_fts/r/fulltext_misc.result
      mysql-test/suite/innodb_fts/r/fulltext_multi.result
      mysql-test/suite/innodb_fts/r/fulltext_order_by.result
      mysql-test/suite/innodb_fts/r/fulltext_update.result
      mysql-test/suite/innodb_fts/r/fulltext_var.result
      mysql-test/suite/innodb_fts/r/innodb-fts-basic.result
      mysql-test/suite/innodb_fts/r/innodb-fts-ddl.result
      mysql-test/suite/innodb_fts/r/innodb-fts-fic.result
      mysql-test/suite/innodb_fts/r/innodb-fts-stopword.result
      mysql-test/suite/innodb_fts/r/innodb_fts_large_records.result
      mysql-test/suite/innodb_fts/r/innodb_fts_misc.result
      mysql-test/suite/innodb_fts/r/innodb_fts_misc_1.result
      mysql-test/suite/innodb_fts/r/innodb_fts_mutiple_index.result
      mysql-test/suite/innodb_fts/r/innodb_fts_proximity.result
      mysql-test/suite/innodb_fts/r/innodb_fts_transaction.result
      mysql-test/suite/innodb_fts/t/
      mysql-test/suite/innodb_fts/t/disabled.def
      mysql-test/suite/innodb_fts/t/fulltext.test
      mysql-test/suite/innodb_fts/t/fulltext2.test
      mysql-test/suite/innodb_fts/t/fulltext3.test
      mysql-test/suite/innodb_fts/t/fulltext_cache.test
      mysql-test/suite/innodb_fts/t/fulltext_distinct.test
      mysql-test/suite/innodb_fts/t/fulltext_left_join.test
      mysql-test/suite/innodb_fts/t/fulltext_misc.test
      mysql-test/suite/innodb_fts/t/fulltext_multi.test
      mysql-test/suite/innodb_fts/t/fulltext_order_by.test
      mysql-test/suite/innodb_fts/t/fulltext_plugin-master.opt
      mysql-test/suite/innodb_fts/t/fulltext_update.test
      mysql-test/suite/innodb_fts/t/fulltext_var.test
      mysql-test/suite/innodb_fts/t/innodb-fts-basic.test
      mysql-test/suite/innodb_fts/t/innodb-fts-ddl.test
      mysql-test/suite/innodb_fts/t/innodb-fts-fic.test
      mysql-test/suite/innodb_fts/t/innodb-fts-stopword.test
      mysql-test/suite/innodb_fts/t/innodb_fts_large_records.test
      mysql-test/suite/innodb_fts/t/innodb_fts_misc.test
      mysql-test/suite/innodb_fts/t/innodb_fts_misc_1.test
      mysql-test/suite/innodb_fts/t/innodb_fts_mutiple_index.test
      mysql-test/suite/innodb_fts/t/innodb_fts_proximity.test
      mysql-test/suite/innodb_fts/t/innodb_fts_transaction.test
      mysql-test/suite/opt_trace/r/temp_table.result
      mysql-test/suite/opt_trace/t/temp_table.test
      mysql-test/suite/rpl/r/rpl_master_connection.result
      mysql-test/suite/rpl/r/rpl_parallel_load_data.result
      mysql-test/suite/rpl/r/rpl_row_find_row_debug.result
      mysql-test/suite/rpl/t/rpl_master_connection-master.opt
      mysql-test/suite/rpl/t/rpl_master_connection-slave.opt
      mysql-test/suite/rpl/t/rpl_master_connection.test
      mysql-test/suite/rpl/t/rpl_parallel_load_data-slave.opt
      mysql-test/suite/rpl/t/rpl_parallel_load_data.test
      mysql-test/suite/rpl/t/rpl_row_find_row_debug.test
      mysql-test/suite/sys_vars/r/innodb_disable_sort_file_cache_basic.result
      mysql-test/suite/sys_vars/r/innodb_ft_aux_table_basic.result
      mysql-test/suite/sys_vars/r/innodb_ft_cache_size_basic.result
      mysql-test/suite/sys_vars/r/innodb_ft_enable_diag_print_basic.result
      mysql-test/suite/sys_vars/r/innodb_ft_enable_stopword_basic.result
      mysql-test/suite/sys_vars/r/innodb_ft_max_token_size_basic.result
      mysql-test/suite/sys_vars/r/innodb_ft_min_token_size_basic.result
      mysql-test/suite/sys_vars/r/innodb_ft_num_word_optimize_basic.result
      mysql-test/suite/sys_vars/r/innodb_ft_server_stopword_table_basic.result
      mysql-test/suite/sys_vars/r/innodb_ft_sort_pll_degree_basic.result
      mysql-test/suite/sys_vars/r/innodb_ft_user_stopword_table_basic.result
      mysql-test/suite/sys_vars/r/innodb_optimize_fulltext_only_basic.result
      mysql-test/suite/sys_vars/r/innodb_page_size_basic.result
      mysql-test/suite/sys_vars/r/innodb_sort_buf_size_basic.result
      mysql-test/suite/sys_vars/r/metadata_locks_cache_size_basic.result
      mysql-test/suite/sys_vars/t/innodb_disable_sort_file_cache_basic.test
      mysql-test/suite/sys_vars/t/innodb_ft_aux_table_basic.test
      mysql-test/suite/sys_vars/t/innodb_ft_cache_size_basic.test
      mysql-test/suite/sys_vars/t/innodb_ft_enable_diag_print_basic.test
      mysql-test/suite/sys_vars/t/innodb_ft_enable_stopword_basic.test
      mysql-test/suite/sys_vars/t/innodb_ft_max_token_size_basic.test
      mysql-test/suite/sys_vars/t/innodb_ft_min_token_size_basic.test
      mysql-test/suite/sys_vars/t/innodb_ft_num_word_optimize_basic.test
      mysql-test/suite/sys_vars/t/innodb_ft_server_stopword_table_basic.test
      mysql-test/suite/sys_vars/t/innodb_ft_sort_pll_degree_basic.test
      mysql-test/suite/sys_vars/t/innodb_ft_user_stopword_table_basic.test
      mysql-test/suite/sys_vars/t/innodb_optimize_fulltext_only_basic.test
      mysql-test/suite/sys_vars/t/innodb_page_size_basic.test
      mysql-test/suite/sys_vars/t/innodb_sort_buf_size_basic.test
      mysql-test/suite/sys_vars/t/metadata_locks_cache_size_basic-master.opt
      mysql-test/suite/sys_vars/t/metadata_locks_cache_size_basic.test
      storage/innobase/fts/
      storage/innobase/fts/Makefile.query
      storage/innobase/fts/fts0ast.cc
      storage/innobase/fts/fts0blex.cc
      storage/innobase/fts/fts0blex.l
      storage/innobase/fts/fts0config.cc
      storage/innobase/fts/fts0opt.cc
      storage/innobase/fts/fts0pars.cc
      storage/innobase/fts/fts0pars.y
      storage/innobase/fts/fts0que.cc
      storage/innobase/fts/fts0sql.cc
      storage/innobase/fts/fts0tlex.cc
      storage/innobase/fts/fts0tlex.l
      storage/innobase/fts/make_parser.sh
      storage/innobase/fut/fut0fut.cc
      storage/innobase/include/fts0ast.h
      storage/innobase/include/fts0blex.h
      storage/innobase/include/fts0fts.h
      storage/innobase/include/fts0opt.h
      storage/innobase/include/fts0pars.h
      storage/innobase/include/fts0priv.h
      storage/innobase/include/fts0priv.ic
      storage/innobase/include/fts0tlex.h
      storage/innobase/include/fts0types.h
      storage/innobase/include/fts0types.ic
      storage/innobase/include/fts0vlc.ic
      storage/innobase/include/fts_uc_data.ic
      storage/innobase/include/row0ftsort.h
      storage/innobase/include/srv0conc.h
      storage/innobase/row/row0ftsort.cc
      storage/innobase/srv/srv0conc.cc
      storage/innobase/srv/srv0conc.cc.moved
      unittest/gunit/cost_estimate-t.cc
    renamed:
      extra/innochecksum.c => extra/innochecksum.cc
      storage/innobase/btr/btr0btr.c => storage/innobase/btr/btr0btr.cc
      storage/innobase/btr/btr0cur.c => storage/innobase/btr/btr0cur.cc
      storage/innobase/btr/btr0pcur.c => storage/innobase/btr/btr0pcur.cc
      storage/innobase/btr/btr0sea.c => storage/innobase/btr/btr0sea.cc
      storage/innobase/buf/buf0buddy.c => storage/innobase/buf/buf0buddy.cc
      storage/innobase/buf/buf0buf.c => storage/innobase/buf/buf0buf.cc
      storage/innobase/buf/buf0checksum.c => storage/innobase/buf/buf0checksum.cc
      storage/innobase/buf/buf0dump.c => storage/innobase/buf/buf0dump.cc
      storage/innobase/buf/buf0flu.c => storage/innobase/buf/buf0flu.cc
      storage/innobase/buf/buf0lru.c => storage/innobase/buf/buf0lru.cc
      storage/innobase/buf/buf0rea.c => storage/innobase/buf/buf0rea.cc
      storage/innobase/data/data0data.c => storage/innobase/data/data0data.cc
      storage/innobase/data/data0type.c => storage/innobase/data/data0type.cc
      storage/innobase/dict/dict0boot.c => storage/innobase/dict/dict0boot.cc
      storage/innobase/dict/dict0crea.c => storage/innobase/dict/dict0crea.cc
      storage/innobase/dict/dict0dict.c => storage/innobase/dict/dict0dict.cc
      storage/innobase/dict/dict0load.c => storage/innobase/dict/dict0load.cc
      storage/innobase/dict/dict0mem.c => storage/innobase/dict/dict0mem.cc
      storage/innobase/dict/dict0stats.c => storage/innobase/dict/dict0stats.cc
      storage/innobase/dyn/dyn0dyn.c => storage/innobase/dyn/dyn0dyn.cc
      storage/innobase/eval/eval0eval.c => storage/innobase/eval/eval0eval.cc
      storage/innobase/eval/eval0proc.c => storage/innobase/eval/eval0proc.cc
      storage/innobase/fil/fil0fil.c => storage/innobase/fil/fil0fil.cc
      storage/innobase/fsp/fsp0fsp.c => storage/innobase/fsp/fsp0fsp.cc
      storage/innobase/fut/fut0fut.c => storage/innobase/fts/fts0fts.cc
      storage/innobase/fut/fut0lst.c => storage/innobase/fut/fut0lst.cc
      storage/innobase/ha/ha0ha.c => storage/innobase/ha/ha0ha.cc
      storage/innobase/ha/ha0storage.c => storage/innobase/ha/ha0storage.cc
      storage/innobase/ha/hash0hash.c => storage/innobase/ha/hash0hash.cc
      storage/innobase/ibuf/ibuf0ibuf.c => storage/innobase/ibuf/ibuf0ibuf.cc
      storage/innobase/lock/lock0iter.c => storage/innobase/lock/lock0iter.cc
      storage/innobase/lock/lock0lock.c => storage/innobase/lock/lock0lock.cc
      storage/innobase/lock/lock0wait.c => storage/innobase/lock/lock0wait.cc
      storage/innobase/log/log0log.c => storage/innobase/log/log0log.cc
      storage/innobase/log/log0recv.c => storage/innobase/log/log0recv.cc
      storage/innobase/mach/mach0data.c => storage/innobase/mach/mach0data.cc
      storage/innobase/mem/mem0dbg.c => storage/innobase/mem/mem0dbg.cc
      storage/innobase/mem/mem0mem.c => storage/innobase/mem/mem0mem.cc
      storage/innobase/mem/mem0pool.c => storage/innobase/mem/mem0pool.cc
      storage/innobase/mtr/mtr0log.c => storage/innobase/mtr/mtr0log.cc
      storage/innobase/mtr/mtr0mtr.c => storage/innobase/mtr/mtr0mtr.cc
      storage/innobase/os/os0file.c => storage/innobase/os/os0file.cc
      storage/innobase/os/os0proc.c => storage/innobase/os/os0proc.cc
      storage/innobase/os/os0sync.c => storage/innobase/os/os0sync.cc
      storage/innobase/os/os0thread.c => storage/innobase/os/os0thread.cc
      storage/innobase/page/page0cur.c => storage/innobase/page/page0cur.cc
      storage/innobase/page/page0page.c => storage/innobase/page/page0page.cc
      storage/innobase/page/page0zip.c => storage/innobase/page/page0zip.cc
      storage/innobase/pars/lexyy.c => storage/innobase/pars/lexyy.cc
      storage/innobase/pars/pars0grm.c => storage/innobase/pars/pars0grm.cc
      storage/innobase/pars/pars0opt.c => storage/innobase/pars/pars0opt.cc
      storage/innobase/pars/pars0pars.c => storage/innobase/pars/pars0pars.cc
      storage/innobase/pars/pars0sym.c => storage/innobase/pars/pars0sym.cc
      storage/innobase/que/que0que.c => storage/innobase/que/que0que.cc
      storage/innobase/read/read0read.c => storage/innobase/read/read0read.cc
      storage/innobase/rem/rem0cmp.c => storage/innobase/rem/rem0cmp.cc
      storage/innobase/rem/rem0rec.c => storage/innobase/rem/rem0rec.cc
      storage/innobase/row/row0ext.c => storage/innobase/row/row0ext.cc
      storage/innobase/row/row0ins.c => storage/innobase/row/row0ins.cc
      storage/innobase/row/row0merge.c => storage/innobase/row/row0merge.cc
      storage/innobase/row/row0mysql.c => storage/innobase/row/row0mysql.cc
      storage/innobase/row/row0purge.c => storage/innobase/row/row0purge.cc
      storage/innobase/row/row0row.c => storage/innobase/row/row0row.cc
      storage/innobase/row/row0sel.c => storage/innobase/row/row0sel.cc
      storage/innobase/row/row0uins.c => storage/innobase/row/row0uins.cc
      storage/innobase/row/row0umod.c => storage/innobase/row/row0umod.cc
      storage/innobase/row/row0undo.c => storage/innobase/row/row0undo.cc
      storage/innobase/row/row0upd.c => storage/innobase/row/row0upd.cc
      storage/innobase/row/row0vers.c => storage/innobase/row/row0vers.cc
      storage/innobase/srv/srv0mon.c => storage/innobase/srv/srv0mon.cc
      storage/innobase/srv/srv0srv.c => storage/innobase/srv/srv0srv.cc
      storage/innobase/srv/srv0start.c => storage/innobase/srv/srv0start.cc
      storage/innobase/sync/sync0arr.c => storage/innobase/sync/sync0arr.cc
      storage/innobase/sync/sync0rw.c => storage/innobase/sync/sync0rw.cc
      storage/innobase/sync/sync0sync.c => storage/innobase/sync/sync0sync.cc
      storage/innobase/trx/trx0i_s.c => storage/innobase/trx/trx0i_s.cc
      storage/innobase/trx/trx0purge.c => storage/innobase/trx/trx0purge.cc
      storage/innobase/trx/trx0rec.c => storage/innobase/trx/trx0rec.cc
      storage/innobase/trx/trx0roll.c => storage/innobase/trx/trx0roll.cc
      storage/innobase/trx/trx0rseg.c => storage/innobase/trx/trx0rseg.cc
      storage/innobase/trx/trx0sys.c => storage/innobase/trx/trx0sys.cc
      storage/innobase/trx/trx0trx.c => storage/innobase/trx/trx0trx.cc
      storage/innobase/trx/trx0undo.c => storage/innobase/trx/trx0undo.cc
      storage/innobase/usr/usr0sess.c => storage/innobase/usr/usr0sess.cc
      storage/innobase/ut/ut0bh.c => storage/innobase/ut/ut0bh.cc
      storage/innobase/ut/ut0byte.c => storage/innobase/ut/ut0byte.cc
      storage/innobase/ut/ut0crc32.c => storage/innobase/ut/ut0crc32.cc
      storage/innobase/ut/ut0dbg.c => storage/innobase/ut/ut0dbg.cc
      storage/innobase/ut/ut0list.c => storage/innobase/ut/ut0list.cc
      storage/innobase/ut/ut0mem.c => storage/innobase/ut/ut0mem.cc
      storage/innobase/ut/ut0rbt.c => storage/innobase/ut/ut0rbt.cc
      storage/innobase/ut/ut0rnd.c => storage/innobase/ut/ut0rnd.cc
      storage/innobase/ut/ut0ut.c => storage/innobase/ut/ut0ut.cc
      storage/innobase/ut/ut0vec.c => storage/innobase/ut/ut0vec.cc
      storage/innobase/ut/ut0wqueue.c => storage/innobase/ut/ut0wqueue.cc
    modified:
      .bzr-mysql/default.conf
      client/mysql_plugin.c
      client/mysql_upgrade.c
      cmd-line-utils/libedit/histedit.h
      cmd-line-utils/libedit/np/unvis.c
      cmd-line-utils/libedit/np/vis.c
      cmd-line-utils/libedit/read.c
      configure.cmake
      extra/CMakeLists.txt
      include/my_base.h
      libmysql/CMakeLists.txt
      mysql-test/collections/default.daily
      mysql-test/collections/default.experimental
      mysql-test/collections/default.push
      mysql-test/collections/default.weekly
      mysql-test/extra/rpl_tests/rpl_parallel_load.test
      mysql-test/include/index_merge_ror_cpk.inc
      mysql-test/include/mix2.inc
      mysql-test/include/mrr_tests.inc
      mysql-test/include/mtr_warnings.sql
      mysql-test/include/subquery_sj.inc
      mysql-test/include/subquery_sj_innodb.inc
      mysql-test/mysql-test-run.pl
      mysql-test/r/alter_table-big.result
      mysql-test/r/auth_rpl.result
      mysql-test/r/create-big.result
      mysql-test/r/derived.result
      mysql-test/r/distinct.result
      mysql-test/r/events_2.result
      mysql-test/r/events_bugs.result
      mysql-test/r/func_analyse.result
      mysql-test/r/func_misc.result
      mysql-test/r/func_str.result
      mysql-test/r/gis.result
      mysql-test/r/group_by.result
      mysql-test/r/group_min_max_innodb.result
      mysql-test/r/index_merge_innodb.result
      mysql-test/r/index_merge_myisam.result
      mysql-test/r/information_schema.result
      mysql-test/r/innodb_explain_non_select_all.result
      mysql-test/r/innodb_mrr.result
      mysql-test/r/innodb_mrr_all.result
      mysql-test/r/innodb_mrr_cost.result
      mysql-test/r/innodb_mrr_cost_all.result
      mysql-test/r/innodb_mrr_cost_icp.result
      mysql-test/r/innodb_mrr_icp.result
      mysql-test/r/innodb_mrr_none.result
      mysql-test/r/innodb_mysql_lock.result
      mysql-test/r/join.result
      mysql-test/r/myisam_explain_non_select_all.result
      mysql-test/r/myisam_mrr.result
      mysql-test/r/myisam_mrr_all.result
      mysql-test/r/myisam_mrr_cost.result
      mysql-test/r/myisam_mrr_cost_all.result
      mysql-test/r/myisam_mrr_cost_icp.result
      mysql-test/r/myisam_mrr_icp.result
      mysql-test/r/myisam_mrr_none.result
      mysql-test/r/mysql_upgrade.result
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/r/mysqlshow.result
      mysql-test/r/not_partition.result
      mysql-test/r/partition_disabled.result
      mysql-test/r/partition_innodb.result
      mysql-test/r/partition_innodb_plugin.result
      mysql-test/r/partition_myisam.result
      mysql-test/r/plugin_auth.result
      mysql-test/r/ps_1general.result
      mysql-test/r/query_cache.result
      mysql-test/r/rpl_mysqldump_slave.result
      mysql-test/r/sp.result
      mysql-test/r/subquery_all.result
      mysql-test/r/subquery_all_bka.result
      mysql-test/r/subquery_mat_all.result
      mysql-test/r/subquery_sj_all.result
      mysql-test/r/subquery_sj_all_bka.result
      mysql-test/r/subquery_sj_all_bka_nixbnl.result
      mysql-test/r/subquery_sj_all_bkaunique.result
      mysql-test/r/subquery_sj_dupsweed.result
      mysql-test/r/subquery_sj_dupsweed_bka.result
      mysql-test/r/subquery_sj_dupsweed_bka_nixbnl.result
      mysql-test/r/subquery_sj_dupsweed_bkaunique.result
      mysql-test/r/subquery_sj_firstmatch.result
      mysql-test/r/subquery_sj_firstmatch_bka.result
      mysql-test/r/subquery_sj_firstmatch_bka_nixbnl.result
      mysql-test/r/subquery_sj_firstmatch_bkaunique.result
      mysql-test/r/subquery_sj_innodb_all.result
      mysql-test/r/subquery_sj_innodb_all_bka.result
      mysql-test/r/subquery_sj_innodb_all_bka_nixbnl.result
      mysql-test/r/subquery_sj_innodb_all_bkaunique.result
      mysql-test/r/subquery_sj_innodb_none.result
      mysql-test/r/subquery_sj_innodb_none_bka.result
      mysql-test/r/subquery_sj_innodb_none_bka_nixbnl.result
      mysql-test/r/subquery_sj_innodb_none_bkaunique.result
      mysql-test/r/subquery_sj_loosescan.result
      mysql-test/r/subquery_sj_loosescan_bka.result
      mysql-test/r/subquery_sj_loosescan_bka_nixbnl.result
      mysql-test/r/subquery_sj_loosescan_bkaunique.result
      mysql-test/r/subquery_sj_mat.result
      mysql-test/r/subquery_sj_mat_bka.result
      mysql-test/r/subquery_sj_mat_bka_nixbnl.result
      mysql-test/r/subquery_sj_mat_bkaunique.result
      mysql-test/r/subquery_sj_mat_nosj.result
      mysql-test/r/subquery_sj_none.result
      mysql-test/r/subquery_sj_none_bka.result
      mysql-test/r/subquery_sj_none_bka_nixbnl.result
      mysql-test/r/subquery_sj_none_bkaunique.result
      mysql-test/r/type_newdecimal.result
      mysql-test/r/variables.result
      mysql-test/r/view.result
      mysql-test/r/view_grant.result
      mysql-test/suite/binlog/r/binlog_rewrite.result
      mysql-test/suite/federated/federated.test
      mysql-test/suite/federated/federated_plugin.test
      mysql-test/suite/innodb/r/innodb-create-options.result
      mysql-test/suite/innodb/r/innodb-index.result
      mysql-test/suite/innodb/r/innodb-lock.result
      mysql-test/suite/innodb/r/innodb-system-table-view.result
      mysql-test/suite/innodb/r/innodb-zip.result
      mysql-test/suite/innodb/r/innodb.result
      mysql-test/suite/innodb/r/innodb_buffer_pool_load.result
      mysql-test/suite/innodb/r/innodb_bug30423.result
      mysql-test/suite/innodb/r/innodb_bug53591.result
      mysql-test/suite/innodb/r/innodb_bug53592.result
      mysql-test/suite/innodb/r/innodb_index_large_prefix.result
      mysql-test/suite/innodb/r/innodb_information_schema.result
      mysql-test/suite/innodb/r/innodb_monitor.result
      mysql-test/suite/innodb/r/innodb_mysql.result
      mysql-test/suite/innodb/t/innodb-create-options.test
      mysql-test/suite/innodb/t/innodb-index.test
      mysql-test/suite/innodb/t/innodb-lock.test
      mysql-test/suite/innodb/t/innodb-system-table-view.test
      mysql-test/suite/innodb/t/innodb-zip.test
      mysql-test/suite/innodb/t/innodb.test
      mysql-test/suite/innodb/t/innodb_buffer_pool_load.test
      mysql-test/suite/innodb/t/innodb_bug30423.test
      mysql-test/suite/innodb/t/innodb_bug34300.test
      mysql-test/suite/innodb/t/innodb_bug36172.test
      mysql-test/suite/innodb/t/innodb_bug53591.test
      mysql-test/suite/innodb/t/innodb_bug53592.test
      mysql-test/suite/innodb/t/innodb_bug60049.test
      mysql-test/suite/innodb/t/innodb_corrupt_bit.test
      mysql-test/suite/innodb/t/innodb_index_large_prefix.test
      mysql-test/suite/innodb/t/innodb_information_schema.test
      mysql-test/suite/innodb/t/innodb_mysql.test
      mysql-test/suite/innodb/t/innodb_prefix_index_liftedlimit.test
      mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test
      mysql-test/suite/innodb/t/innodb_trx_weight.test
      mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result
      mysql-test/suite/opt_trace/include/general.inc
      mysql-test/suite/opt_trace/include/range.inc
      mysql-test/suite/opt_trace/include/subquery.inc
      mysql-test/suite/opt_trace/r/bugs_no_prot_all.result
      mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result
      mysql-test/suite/opt_trace/r/charset.result
      mysql-test/suite/opt_trace/r/filesort_pq.result
      mysql-test/suite/opt_trace/r/general2_no_prot.result
      mysql-test/suite/opt_trace/r/general2_ps_prot.result
      mysql-test/suite/opt_trace/r/general_no_prot_all.result
      mysql-test/suite/opt_trace/r/general_no_prot_none.result
      mysql-test/suite/opt_trace/r/general_ps_prot_all.result
      mysql-test/suite/opt_trace/r/general_ps_prot_none.result
      mysql-test/suite/opt_trace/r/range_no_prot.result
      mysql-test/suite/opt_trace/r/range_ps_prot.result
      mysql-test/suite/opt_trace/r/security_no_prot.result
      mysql-test/suite/opt_trace/r/security_ps_prot.result
      mysql-test/suite/opt_trace/r/subquery_no_prot.result
      mysql-test/suite/opt_trace/r/subquery_ps_prot.result
      mysql-test/suite/parts/inc/partition_alter3.inc
      mysql-test/suite/parts/r/partition_alter3_myisam.result
      mysql-test/suite/parts/r/partition_debug_innodb.result
      mysql-test/suite/parts/r/rpl-partition-dml-1-1-innodb.result
      mysql-test/suite/parts/r/rpl-partition-dml-1-1-myisam.result
      mysql-test/suite/parts/r/rpl_partition.result
      mysql-test/suite/parts/t/partition_debug_innodb.test
      mysql-test/suite/perfschema/r/relaylog.result
      mysql-test/suite/perfschema/t/disabled.def
      mysql-test/suite/rpl/r/rpl_000010.result
      mysql-test/suite/rpl/r/rpl_000011.result
      mysql-test/suite/rpl/r/rpl_000013.result
      mysql-test/suite/rpl/r/rpl_000017.result
      mysql-test/suite/rpl/r/rpl_DML_error.result
      mysql-test/suite/rpl/r/rpl_EE_err.result
      mysql-test/suite/rpl/r/rpl_LD_INFILE.result
      mysql-test/suite/rpl/r/rpl_alter.result
      mysql-test/suite/rpl/r/rpl_alter_db.result
      mysql-test/suite/rpl/r/rpl_alter_repository.result
      mysql-test/suite/rpl/r/rpl_auto_increment.result
      mysql-test/suite/rpl/r/rpl_auto_increment_11932.result
      mysql-test/suite/rpl/r/rpl_auto_increment_bug33029.result
      mysql-test/suite/rpl/r/rpl_auto_increment_update_failure.result
      mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result
      mysql-test/suite/rpl/r/rpl_binlog_corruption.result
      mysql-test/suite/rpl/r/rpl_binlog_errors.result
      mysql-test/suite/rpl/r/rpl_binlog_grant.result
      mysql-test/suite/rpl/r/rpl_bit.result
      mysql-test/suite/rpl/r/rpl_bit_npk.result
      mysql-test/suite/rpl/r/rpl_blackhole.result
      mysql-test/suite/rpl/r/rpl_bug26395.result
      mysql-test/suite/rpl/r/rpl_bug31076.result
      mysql-test/suite/rpl/r/rpl_bug33931.result
      mysql-test/suite/rpl/r/rpl_bug37426.result
      mysql-test/suite/rpl/r/rpl_bug38694.result
      mysql-test/suite/rpl/r/rpl_bug41902.result
      mysql-test/suite/rpl/r/rpl_change_master.result
      mysql-test/suite/rpl/r/rpl_change_master_crash_safe.result
      mysql-test/suite/rpl/r/rpl_change_master_dbug.result
      mysql-test/suite/rpl/r/rpl_charset.result
      mysql-test/suite/rpl/r/rpl_charset_sjis.result
      mysql-test/suite/rpl/r/rpl_checksum.result
      mysql-test/suite/rpl/r/rpl_checksum_cache.result
      mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result
      mysql-test/suite/rpl/r/rpl_colSize.result
      mysql-test/suite/rpl/r/rpl_commit_after_flush.result
      mysql-test/suite/rpl/r/rpl_concurrency_error.result
      mysql-test/suite/rpl/r/rpl_conditional_comments.result
      mysql-test/suite/rpl/r/rpl_corruption.result
      mysql-test/suite/rpl/r/rpl_crash_safe_master.result
      mysql-test/suite/rpl/r/rpl_create_database.result
      mysql-test/suite/rpl/r/rpl_create_if_not_exists.result
      mysql-test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result
      mysql-test/suite/rpl/r/rpl_cross_version.result
      mysql-test/suite/rpl/r/rpl_current_user.result
      mysql-test/suite/rpl/r/rpl_deadlock_innodb.result
      mysql-test/suite/rpl/r/rpl_delete_no_where.result
      mysql-test/suite/rpl/r/rpl_do_db_filter.result
      mysql-test/suite/rpl/r/rpl_do_grant.result
      mysql-test/suite/rpl/r/rpl_do_table_filter_insensitive.result
      mysql-test/suite/rpl/r/rpl_do_table_filter_sensitive.result
      mysql-test/suite/rpl/r/rpl_drop.result
      mysql-test/suite/rpl/r/rpl_drop_db.result
      mysql-test/suite/rpl/r/rpl_drop_temp.result
      mysql-test/suite/rpl/r/rpl_drop_view.result
      mysql-test/suite/rpl/r/rpl_dual_pos_advance.result
      mysql-test/suite/rpl/r/rpl_empty_master_host.result
      mysql-test/suite/rpl/r/rpl_err_ignoredtable.result
      mysql-test/suite/rpl/r/rpl_events.result
      mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result
      mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result
      mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result
      mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result
      mysql-test/suite/rpl/r/rpl_failed_optimize.result
      mysql-test/suite/rpl/r/rpl_filter_database.result
      mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result
      mysql-test/suite/rpl/r/rpl_flush_logs.result
      mysql-test/suite/rpl/r/rpl_flushlog_loop.result
      mysql-test/suite/rpl/r/rpl_foreign_key_innodb.result
      mysql-test/suite/rpl/r/rpl_free_items.result
      mysql-test/suite/rpl/r/rpl_general_log.result
      mysql-test/suite/rpl/r/rpl_geometry.result
      mysql-test/suite/rpl/r/rpl_get_lock.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_grant_plugin.result
      mysql-test/suite/rpl/r/rpl_heartbeat.result
      mysql-test/suite/rpl/r/rpl_heartbeat_2slaves.result
      mysql-test/suite/rpl/r/rpl_heartbeat_basic.result
      mysql-test/suite/rpl/r/rpl_heartbeat_ssl.result
      mysql-test/suite/rpl/r/rpl_idempotency.result
      mysql-test/suite/rpl/r/rpl_ignore_db_filter.result
      mysql-test/suite/rpl/r/rpl_ignore_grant.result
      mysql-test/suite/rpl/r/rpl_ignore_revoke.result
      mysql-test/suite/rpl/r/rpl_ignore_table.result
      mysql-test/suite/rpl/r/rpl_ignore_table_filter_insensitive.result
      mysql-test/suite/rpl/r/rpl_ignore_table_filter_sensitive.result
      mysql-test/suite/rpl/r/rpl_ignore_table_update.result
      mysql-test/suite/rpl/r/rpl_incident.result
      mysql-test/suite/rpl/r/rpl_init_slave.result
      mysql-test/suite/rpl/r/rpl_init_slave_errors.result
      mysql-test/suite/rpl/r/rpl_innodb_bug28430.result
      mysql-test/suite/rpl/r/rpl_innodb_bug30888.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_insert.result
      mysql-test/suite/rpl/r/rpl_insert_id.result
      mysql-test/suite/rpl/r/rpl_insert_id_pk.result
      mysql-test/suite/rpl/r/rpl_insert_ignore.result
      mysql-test/suite/rpl/r/rpl_invoked_features.result
      mysql-test/suite/rpl/r/rpl_ip_mix.result
      mysql-test/suite/rpl/r/rpl_ip_mix2.result
      mysql-test/suite/rpl/r/rpl_ipv4_as_ipv6.result
      mysql-test/suite/rpl/r/rpl_ipv6.result
      mysql-test/suite/rpl/r/rpl_killed_ddl.result
      mysql-test/suite/rpl/r/rpl_known_bugs_detection.result
      mysql-test/suite/rpl/r/rpl_lcase_tblnames_rewrite_db.result
      mysql-test/suite/rpl/r/rpl_loaddata.result
      mysql-test/suite/rpl/r/rpl_loaddata_charset.result
      mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
      mysql-test/suite/rpl/r/rpl_loaddata_m.result
      mysql-test/suite/rpl/r/rpl_loaddata_map.result
      mysql-test/suite/rpl/r/rpl_loaddata_s.result
      mysql-test/suite/rpl/r/rpl_loaddata_simple.result
      mysql-test/suite/rpl/r/rpl_loaddata_symlink.result
      mysql-test/suite/rpl/r/rpl_loaddatalocal.result
      mysql-test/suite/rpl/r/rpl_loadfile.result
      mysql-test/suite/rpl/r/rpl_locale.result
      mysql-test/suite/rpl/r/rpl_log_pos.result
      mysql-test/suite/rpl/r/rpl_manual_change_index_file.result
      mysql-test/suite/rpl/r/rpl_many_optimize.result
      mysql-test/suite/rpl/r/rpl_master_pos_wait.result
      mysql-test/suite/rpl/r/rpl_migration_crash_safe.result
      mysql-test/suite/rpl/r/rpl_misc_functions.result
      mysql-test/suite/rpl/r/rpl_mix_found_rows.result
      mysql-test/suite/rpl/r/rpl_mix_insert_delayed.result
      mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_mixed_bit_pk.result
      mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result
      mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result
      mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result
      mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_mixed_mts_crash_safe.result
      mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe.result
      mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe_checksum.result
      mysql-test/suite/rpl/r/rpl_mts_check_concurrency.result
      mysql-test/suite/rpl/r/rpl_multi_delete.result
      mysql-test/suite/rpl/r/rpl_multi_delete2.result
      mysql-test/suite/rpl/r/rpl_multi_engine.result
      mysql-test/suite/rpl/r/rpl_multi_update.result
      mysql-test/suite/rpl/r/rpl_multi_update2.result
      mysql-test/suite/rpl/r/rpl_multi_update3.result
      mysql-test/suite/rpl/r/rpl_multi_update4.result
      mysql-test/suite/rpl/r/rpl_mysql_upgrade.result
      mysql-test/suite/rpl/r/rpl_name_const.result
      mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_non_direct_row_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_nondeterministic_functions.result
      mysql-test/suite/rpl/r/rpl_not_null_innodb.result
      mysql-test/suite/rpl/r/rpl_not_null_myisam.result
      mysql-test/suite/rpl/r/rpl_optimize.result
      mysql-test/suite/rpl/r/rpl_packet.result
      mysql-test/suite/rpl/r/rpl_parallel.result
      mysql-test/suite/rpl/r/rpl_parallel_conf_limits.result
      mysql-test/suite/rpl/r/rpl_parallel_conflicts.result
      mysql-test/suite/rpl/r/rpl_parallel_ddl.result
      mysql-test/suite/rpl/r/rpl_parallel_innodb.result
      mysql-test/suite/rpl/r/rpl_parallel_multi_db.result
      mysql-test/suite/rpl/r/rpl_parallel_seconds_behind_master.result
      mysql-test/suite/rpl/r/rpl_parallel_start_stop.result
      mysql-test/suite/rpl/r/rpl_parallel_switch_sequential.result
      mysql-test/suite/rpl/r/rpl_parallel_temp_query.result
      mysql-test/suite/rpl/r/rpl_partition_archive.result
      mysql-test/suite/rpl/r/rpl_partition_innodb.result
      mysql-test/suite/rpl/r/rpl_partition_memory.result
      mysql-test/suite/rpl/r/rpl_partition_myisam.result
      mysql-test/suite/rpl/r/rpl_plugin_load.result
      mysql-test/suite/rpl/r/rpl_ps.result
      mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result
      mysql-test/suite/rpl/r/rpl_read_old_relay_log_info.result
      mysql-test/suite/rpl/r/rpl_read_only.result
      mysql-test/suite/rpl/r/rpl_relay_space_innodb.result
      mysql-test/suite/rpl/r/rpl_relay_space_myisam.result
      mysql-test/suite/rpl/r/rpl_relayrotate.result
      mysql-test/suite/rpl/r/rpl_relayspace.result
      mysql-test/suite/rpl/r/rpl_replicate_do.result
      mysql-test/suite/rpl/r/rpl_replicate_ignore_db.result
      mysql-test/suite/rpl/r/rpl_report.result
      mysql-test/suite/rpl/r/rpl_rewrite_db_filter.result
      mysql-test/suite/rpl/r/rpl_rewrt_db.result
      mysql-test/suite/rpl/r/rpl_rotate_logs.result
      mysql-test/suite/rpl/r/rpl_rotate_purge_deadlock.result
      mysql-test/suite/rpl/r/rpl_row_001.result
      mysql-test/suite/rpl/r/rpl_row_4_bytes.result
      mysql-test/suite/rpl/r/rpl_row_NOW.result
      mysql-test/suite/rpl/r/rpl_row_USER.result
      mysql-test/suite/rpl/r/rpl_row_UUID.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_basic_8partition.result
      mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_row_blob_innodb.result
      mysql-test/suite/rpl/r/rpl_row_blob_myisam.result
      mysql-test/suite/rpl/r/rpl_row_colSize.result
      mysql-test/suite/rpl/r/rpl_row_conflicts.result
      mysql-test/suite/rpl/r/rpl_row_corruption.result
      mysql-test/suite/rpl/r/rpl_row_crash_safe.result
      mysql-test/suite/rpl/r/rpl_row_delayed_ins.result
      mysql-test/suite/rpl/r/rpl_row_drop.result
      mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result
      mysql-test/suite/rpl/r/rpl_row_event_max_size.result
      mysql-test/suite/rpl/r/rpl_row_find_row.result
      mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result
      mysql-test/suite/rpl/r/rpl_row_func001.result
      mysql-test/suite/rpl/r/rpl_row_func002.result
      mysql-test/suite/rpl/r/rpl_row_func003.result
      mysql-test/suite/rpl/r/rpl_row_idempotency.result
      mysql-test/suite/rpl/r/rpl_row_ignorable_event.result
      mysql-test/suite/rpl/r/rpl_row_img_blobs.result
      mysql-test/suite/rpl/r/rpl_row_img_eng_full.result
      mysql-test/suite/rpl/r/rpl_row_img_eng_min.result
      mysql-test/suite/rpl/r/rpl_row_img_eng_noblob.result
      mysql-test/suite/rpl/r/rpl_row_img_idx_full.result
      mysql-test/suite/rpl/r/rpl_row_img_idx_min.result
      mysql-test/suite/rpl/r/rpl_row_img_idx_noblob.result
      mysql-test/suite/rpl/r/rpl_row_img_misc.result
      mysql-test/suite/rpl/r/rpl_row_img_sanity.result
      mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result
      mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result
      mysql-test/suite/rpl/r/rpl_row_insert_delayed.result
      mysql-test/suite/rpl/r/rpl_row_lcase_tblnames.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_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result
      mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result
      mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result
      mysql-test/suite/rpl/r/rpl_row_rec_comp_innodb.result
      mysql-test/suite/rpl/r/rpl_row_rec_comp_myisam.result
      mysql-test/suite/rpl/r/rpl_row_record_find_myisam.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_sp001.result
      mysql-test/suite/rpl/r/rpl_row_sp002_innodb.result
      mysql-test/suite/rpl/r/rpl_row_sp003.result
      mysql-test/suite/rpl/r/rpl_row_sp005.result
      mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result
      mysql-test/suite/rpl/r/rpl_row_sp007_innodb.result
      mysql-test/suite/rpl/r/rpl_row_sp008.result
      mysql-test/suite/rpl/r/rpl_row_sp009.result
      mysql-test/suite/rpl/r/rpl_row_sp010.result
      mysql-test/suite/rpl/r/rpl_row_sp011.result
      mysql-test/suite/rpl/r/rpl_row_sp012.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_tbl_metadata.result
      mysql-test/suite/rpl/r/rpl_row_trig001.result
      mysql-test/suite/rpl/r/rpl_row_trig002.result
      mysql-test/suite/rpl/r/rpl_row_trig003.result
      mysql-test/suite/rpl/r/rpl_row_trig004.result
      mysql-test/suite/rpl/r/rpl_row_trunc_temp.result
      mysql-test/suite/rpl/r/rpl_row_unsafe_funcs.result
      mysql-test/suite/rpl/r/rpl_row_utf16.result
      mysql-test/suite/rpl/r/rpl_row_utf32.result
      mysql-test/suite/rpl/r/rpl_row_view01.result
      mysql-test/suite/rpl/r/rpl_row_wide_table.result
      mysql-test/suite/rpl/r/rpl_savepoint.result
      mysql-test/suite/rpl/r/rpl_seconds_behind_master.result
      mysql-test/suite/rpl/r/rpl_semi_sync.result
      mysql-test/suite/rpl/r/rpl_semi_sync_event.result
      mysql-test/suite/rpl/r/rpl_sequential.result
      mysql-test/suite/rpl/r/rpl_server_id1.result
      mysql-test/suite/rpl/r/rpl_server_id2.result
      mysql-test/suite/rpl/r/rpl_server_id_ignore.result
      mysql-test/suite/rpl/r/rpl_server_uuid.result
      mysql-test/suite/rpl/r/rpl_session_var.result
      mysql-test/suite/rpl/r/rpl_set_charset.result
      mysql-test/suite/rpl/r/rpl_set_null_innodb.result
      mysql-test/suite/rpl/r/rpl_set_null_myisam.result
      mysql-test/suite/rpl/r/rpl_show_errors.result
      mysql-test/suite/rpl/r/rpl_show_master_info_file.result
      mysql-test/suite/rpl/r/rpl_show_slave_hosts.result
      mysql-test/suite/rpl/r/rpl_show_slave_running.result
      mysql-test/suite/rpl/r/rpl_skip_error.result
      mysql-test/suite/rpl/r/rpl_skip_incident.result
      mysql-test/suite/rpl/r/rpl_slave_grp_exec.result
      mysql-test/suite/rpl/r/rpl_slave_load_in.result
      mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
      mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result
      mysql-test/suite/rpl/r/rpl_slave_skip.result
      mysql-test/suite/rpl/r/rpl_slave_start.result
      mysql-test/suite/rpl/r/rpl_slave_status.result
      mysql-test/suite/rpl/r/rpl_slow_query_log.result
      mysql-test/suite/rpl/r/rpl_sp.result
      mysql-test/suite/rpl/r/rpl_sp004.result
      mysql-test/suite/rpl/r/rpl_sp_effects.result
      mysql-test/suite/rpl/r/rpl_spec_variables.result
      mysql-test/suite/rpl/r/rpl_sporadic_master.result
      mysql-test/suite/rpl/r/rpl_ssl.result
      mysql-test/suite/rpl/r/rpl_ssl1.result
      mysql-test/suite/rpl/r/rpl_stm_000001.result
      mysql-test/suite/rpl/r/rpl_stm_EE_err2.result
      mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result
      mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_stm_conflicts.result
      mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result
      mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result
      mysql-test/suite/rpl/r/rpl_stm_found_rows.result
      mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.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_lcase_tblnames.result
      mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result
      mysql-test/suite/rpl/r/rpl_stm_loadfile.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_mixed_crash_safe.result
      mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_stm_mts_crash_safe.result
      mysql-test/suite/rpl/r/rpl_stm_mts_rec_crash_safe.result
      mysql-test/suite/rpl/r/rpl_stm_multi_query.result
      mysql-test/suite/rpl/r/rpl_stm_no_op.result
      mysql-test/suite/rpl/r/rpl_stm_reset_slave.result
      mysql-test/suite/rpl/r/rpl_stm_sql_mode.result
      mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result
      mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result
      mysql-test/suite/rpl/r/rpl_stm_user_variables.result
      mysql-test/suite/rpl/r/rpl_stop_slave.result
      mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result
      mysql-test/suite/rpl/r/rpl_sync.result
      mysql-test/suite/rpl/r/rpl_temp_table.result
      mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result
      mysql-test/suite/rpl/r/rpl_temporary.result
      mysql-test/suite/rpl/r/rpl_temporary_errors.result
      mysql-test/suite/rpl/r/rpl_test_framework.result
      mysql-test/suite/rpl/r/rpl_timezone.result
      mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL.result
      mysql-test/suite/rpl/r/rpl_trigger.result
      mysql-test/suite/rpl/r/rpl_trunc_temp.result
      mysql-test/suite/rpl/r/rpl_truncate_2myisam.result
      mysql-test/suite/rpl/r/rpl_truncate_3innodb.result
      mysql-test/suite/rpl/r/rpl_typeconv.result
      mysql-test/suite/rpl/r/rpl_typeconv_innodb.result
      mysql-test/suite/rpl/r/rpl_udf.result
      mysql-test/suite/rpl/r/rpl_user.result
      mysql-test/suite/rpl/r/rpl_user_variables.result
      mysql-test/suite/rpl/r/rpl_variables.result
      mysql-test/suite/rpl/r/rpl_variables_stm.result
      mysql-test/suite/rpl/r/rpl_view.result
      mysql-test/suite/rpl/r/rpl_view_multi.result
      mysql-test/suite/rpl/t/rpl_parallel_ddl.test
      mysql-test/suite/sys_vars/inc/delayed_queue_size_basic.inc
      mysql-test/suite/sys_vars/inc/log_warnings_basic.inc
      mysql-test/suite/sys_vars/inc/query_cache_size_basic.inc
      mysql-test/suite/sys_vars/r/innodb_monitor_disable_basic.result
      mysql-test/suite/sys_vars/r/innodb_monitor_enable_basic.result
      mysql-test/suite/sys_vars/r/innodb_monitor_reset_all_basic.result
      mysql-test/suite/sys_vars/r/innodb_monitor_reset_basic.result
      mysql-test/suite/sys_vars/r/log_warnings_basic_32.result
      mysql-test/suite/sys_vars/r/log_warnings_basic_64.result
      mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result
      mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result
      mysql-test/suite/sys_vars/r/relay_log_basename_basic.result
      mysql-test/suite/sys_vars/r/relay_log_index_basic.result
      mysql-test/suite/sys_vars/r/rpl_init_slave_func.result
      mysql-test/suite/sys_vars/t/delayed_insert_timeout_basic.test
      mysql-test/suite/sys_vars/t/disabled.def
      mysql-test/suite/sys_vars/t/innodb_buffer_pool_load_at_startup_basic.test
      mysql-test/t/alter_table-big.test
      mysql-test/t/create-big.test
      mysql-test/t/ctype_utf8mb4_innodb.test
      mysql-test/t/derived.test
      mysql-test/t/disabled.def
      mysql-test/t/distinct.test
      mysql-test/t/func_analyse.test
      mysql-test/t/func_misc.test
      mysql-test/t/func_str.test
      mysql-test/t/gis.test
      mysql-test/t/group_by.test
      mysql-test/t/group_min_max_innodb.test
      mysql-test/t/innodb_mysql_lock.test
      mysql-test/t/join.test
      mysql-test/t/mysql_plugin.test
      mysql-test/t/mysql_upgrade.test
      mysql-test/t/mysqlbinlog_row_innodb.test
      mysql-test/t/not_partition.test
      mysql-test/t/partition_disabled.test
      mysql-test/t/partition_innodb.test
      mysql-test/t/partition_innodb_plugin.test
      mysql-test/t/partition_myisam.test
      mysql-test/t/plugin_auth.test
      mysql-test/t/ps_1general.test
      mysql-test/t/query_cache.test
      mysql-test/t/rewrite_general_log.test
      mysql-test/t/sp.test
      mysql-test/t/type_newdecimal.test
      mysql-test/t/variables.test
      mysql-test/t/view.test
      mysql-test/t/view_grant.test
      mysql-test/valgrind.supp
      mysys/my_handler_errors.h
      scripts/mysql_config.sh
      scripts/mysqld_safe.sh
      sql/CMakeLists.txt
      sql/binlog.cc
      sql/filesort.cc
      sql/ha_partition.cc
      sql/handler.cc
      sql/handler.h
      sql/item.cc
      sql/item.h
      sql/item_func.cc
      sql/item_geofunc.cc
      sql/item_strfunc.cc
      sql/lex.h
      sql/log_event.cc
      sql/log_event.h
      sql/mdl.cc
      sql/mdl.h
      sql/my_decimal.h
      sql/mysqld.cc
      sql/mysqld.h
      sql/opt_explain.cc
      sql/opt_range.cc
      sql/rpl_handler.cc
      sql/rpl_master.cc
      sql/rpl_mi.cc
      sql/rpl_mi.h
      sql/rpl_reporting.cc
      sql/rpl_rli.cc
      sql/rpl_rli.h
      sql/rpl_rli_pdb.cc
      sql/rpl_rli_pdb.h
      sql/rpl_slave.cc
      sql/share/errmsg-utf8.txt
      sql/sp_head.cc
      sql/sql_acl.cc
      sql/sql_bitmap.h
      sql/sql_cache.cc
      sql/sql_class.h
      sql/sql_connect.cc
      sql/sql_const.h
      sql/sql_derived.cc
      sql/sql_insert.cc
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_parse.cc
      sql/sql_partition.cc
      sql/sql_plist.h
      sql/sql_plugin.cc
      sql/sql_reload.cc
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_table.cc
      sql/sql_udf.cc
      sql/sql_union.cc
      sql/sql_view.cc
      sql/sql_yacc.yy
      sql/sys_vars.cc
      sql/table.cc
      sql/table.h
      storage/innobase/CMakeLists.txt
      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/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/buf0checksum.h
      storage/innobase/include/buf0dump.h
      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/dict0priv.h
      storage/innobase/include/dict0priv.ic
      storage/innobase/include/dict0stats.h
      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/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/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/srv0mon.h
      storage/innobase/include/srv0mon.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/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/ut0bh.h
      storage/innobase/include/ut0byte.h
      storage/innobase/include/ut0byte.ic
      storage/innobase/include/ut0crc32.h
      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/pars/make_bison.sh
      storage/innobase/pars/make_flex.sh
      storage/innobase/pars/pars0grm.y
      storage/innobase/pars/pars0lex.l
      storage/myisam/ha_myisam.cc
      storage/myisam/ha_myisam.h
      strings/decimal.c
      support-files/mysql.spec.sh
      tests/mysql_client_test.c
      unittest/gunit/CMakeLists.txt
      unittest/gunit/my_decimal-t.cc
      extra/innochecksum.cc
      storage/innobase/btr/btr0btr.cc
      storage/innobase/btr/btr0cur.cc
      storage/innobase/btr/btr0pcur.cc
      storage/innobase/btr/btr0sea.cc
      storage/innobase/buf/buf0buddy.cc
      storage/innobase/buf/buf0buf.cc
      storage/innobase/buf/buf0checksum.cc
      storage/innobase/buf/buf0dump.cc
      storage/innobase/buf/buf0flu.cc
      storage/innobase/buf/buf0lru.cc
      storage/innobase/buf/buf0rea.cc
      storage/innobase/data/data0data.cc
      storage/innobase/data/data0type.cc
      storage/innobase/dict/dict0boot.cc
      storage/innobase/dict/dict0crea.cc
      storage/innobase/dict/dict0dict.cc
      storage/innobase/dict/dict0load.cc
      storage/innobase/dict/dict0mem.cc
      storage/innobase/dict/dict0stats.cc
      storage/innobase/dyn/dyn0dyn.cc
      storage/innobase/eval/eval0eval.cc
      storage/innobase/eval/eval0proc.cc
      storage/innobase/fil/fil0fil.cc
      storage/innobase/fsp/fsp0fsp.cc
      storage/innobase/fts/fts0fts.cc
      storage/innobase/fut/fut0lst.cc
      storage/innobase/ha/ha0ha.cc
      storage/innobase/ha/ha0storage.cc
      storage/innobase/ha/hash0hash.cc
      storage/innobase/ibuf/ibuf0ibuf.cc
      storage/innobase/lock/lock0iter.cc
      storage/innobase/lock/lock0lock.cc
      storage/innobase/lock/lock0wait.cc
      storage/innobase/log/log0log.cc
      storage/innobase/log/log0recv.cc
      storage/innobase/mach/mach0data.cc
      storage/innobase/mem/mem0dbg.cc
      storage/innobase/mem/mem0mem.cc
      storage/innobase/mem/mem0pool.cc
      storage/innobase/mtr/mtr0log.cc
      storage/innobase/mtr/mtr0mtr.cc
      storage/innobase/os/os0file.cc
      storage/innobase/os/os0proc.cc
      storage/innobase/os/os0sync.cc
      storage/innobase/os/os0thread.cc
      storage/innobase/page/page0cur.cc
      storage/innobase/page/page0page.cc
      storage/innobase/page/page0zip.cc
      storage/innobase/pars/lexyy.cc
      storage/innobase/pars/pars0grm.cc
      storage/innobase/pars/pars0opt.cc
      storage/innobase/pars/pars0pars.cc
      storage/innobase/pars/pars0sym.cc
      storage/innobase/que/que0que.cc
      storage/innobase/read/read0read.cc
      storage/innobase/rem/rem0cmp.cc
      storage/innobase/rem/rem0rec.cc
      storage/innobase/row/row0ext.cc
      storage/innobase/row/row0ins.cc
      storage/innobase/row/row0merge.cc
      storage/innobase/row/row0mysql.cc
      storage/innobase/row/row0purge.cc
      storage/innobase/row/row0row.cc
      storage/innobase/row/row0sel.cc
      storage/innobase/row/row0uins.cc
      storage/innobase/row/row0umod.cc
      storage/innobase/row/row0undo.cc
      storage/innobase/row/row0upd.cc
      storage/innobase/row/row0vers.cc
      storage/innobase/srv/srv0mon.cc
      storage/innobase/srv/srv0srv.cc
      storage/innobase/srv/srv0start.cc
      storage/innobase/sync/sync0arr.cc
      storage/innobase/sync/sync0rw.cc
      storage/innobase/sync/sync0sync.cc
      storage/innobase/trx/trx0i_s.cc
      storage/innobase/trx/trx0purge.cc
      storage/innobase/trx/trx0rec.cc
      storage/innobase/trx/trx0roll.cc
      storage/innobase/trx/trx0rseg.cc
      storage/innobase/trx/trx0sys.cc
      storage/innobase/trx/trx0trx.cc
      storage/innobase/trx/trx0undo.cc
      storage/innobase/usr/usr0sess.cc
      storage/innobase/ut/ut0bh.cc
      storage/innobase/ut/ut0byte.cc
      storage/innobase/ut/ut0crc32.cc
      storage/innobase/ut/ut0dbg.cc
      storage/innobase/ut/ut0list.cc
      storage/innobase/ut/ut0mem.cc
      storage/innobase/ut/ut0rbt.cc
      storage/innobase/ut/ut0rnd.cc
      storage/innobase/ut/ut0ut.cc
      storage/innobase/ut/ut0vec.cc
      storage/innobase/ut/ut0wqueue.cc
 3137 Bjorn Munch	2011-11-09 [merge]
      null upmerge


Diff too large for email (140090 lines, the limit is 10000).
No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (bjorn.munch:3137 to 3138) Bjorn Munch22 Nov