List:Commits« Previous MessageNext Message »
From:Ole John Aske Date:October 15 2010 6:59pm
Subject:bzr push into mysql-5.1-telco-7.0-spj branch (ole.john.aske:3223 to 3224)
View as plain text  
 3224 Ole John Aske	2010-10-15
      
      Cleanup: Removed some leftovers of cherry picked bugfixes / temp. patches
      which now are part of mysql 5.1.51 which we have just merged from.

    modified:
      sql/sql_select.cc
 3223 Ole John Aske	2010-10-15 [merge]
      merge from telco-7.0 mainline

    removed:
      include/atomic/
      include/atomic/gcc_builtins.h
      include/atomic/nolock.h
      include/atomic/rwlock.h
      include/atomic/x86-gcc.h
      include/atomic/x86-msvc.h
      include/my_atomic.h
      mysql-test/include/show_slave_status2.inc
      mysql-test/suite/rpl/r/rpl_000015.result
      mysql-test/suite/rpl/t/rpl_000015-slave.opt
      mysql-test/suite/rpl/t/rpl_000015.cnf
      mysql-test/suite/rpl/t/rpl_000015.test
      mysys/my_atomic.c
      storage/ndb/swig/
      storage/ndb/swig/Makefile.am
      storage/ndb/swig/globals.i
      storage/ndb/swig/mgmapi/
      storage/ndb/swig/mgmapi/ClusterState.i
      storage/ndb/swig/mgmapi/NdbLogEvent.i
      storage/ndb/swig/mgmapi/NdbLogEventManager.i
      storage/ndb/swig/mgmapi/NdbMgm.i
      storage/ndb/swig/mgmapi/NdbMgmFactory.i
      storage/ndb/swig/mgmapi/NdbMgmReply.i
      storage/ndb/swig/mgmapi/NodeState.i
      storage/ndb/swig/mgmapi/events.i
      storage/ndb/swig/mgmapi/listeners.i
      storage/ndb/swig/mgmapi/mgmglobals.i
      storage/ndb/swig/ndbapi/
      storage/ndb/swig/ndbapi/Ndb.i
      storage/ndb/swig/ndbapi/NdbBlob.i
      storage/ndb/swig/ndbapi/NdbClusterConnection.i
      storage/ndb/swig/ndbapi/NdbDictionary.i
      storage/ndb/swig/ndbapi/NdbError.i
      storage/ndb/swig/ndbapi/NdbEventOperation.i
      storage/ndb/swig/ndbapi/NdbFactory.i
      storage/ndb/swig/ndbapi/NdbIndexOperation.i
      storage/ndb/swig/ndbapi/NdbIndexScanOperation.i
      storage/ndb/swig/ndbapi/NdbOperation.i
      storage/ndb/swig/ndbapi/NdbRecAttr.i
      storage/ndb/swig/ndbapi/NdbScanFilter.i
      storage/ndb/swig/ndbapi/NdbScanOperation.i
      storage/ndb/swig/ndbapi/NdbTransaction.i
      storage/ndb/swig/ndbapi/ndbglobals.i
      strings/bcmp.c
      strings/bzero.c
      unittest/mysys/my_atomic-t.c
    added:
      config/ac-macros/maintainer.m4
      include/my_compiler.h
      mysql-test/extra/rpl_tests/rpl_record_compare.test
      mysql-test/extra/rpl_tests/rpl_stm_create_if_not_exists.test
      mysql-test/include/check_concurrent_insert.inc
      mysql-test/include/check_no_concurrent_insert.inc
      mysql-test/include/check_no_row_lock.inc
      mysql-test/include/check_shared_row_lock.inc
      mysql-test/include/check_slave_is_running.inc
      mysql-test/include/check_slave_no_error.inc
      mysql-test/include/check_slave_param.inc
      mysql-test/include/get_relay_log_pos.inc
      mysql-test/include/mysqlhotcopy.inc
      mysql-test/include/not_blackhole.inc
      mysql-test/include/rpl_diff_tables.inc
      mysql-test/r/innodb_mysql_lock2.result
      mysql-test/r/lock_sync.result
      mysql-test/r/mysqlhotcopy_archive.result
      mysql-test/r/mysqlhotcopy_myisam.result
      mysql-test/r/partition_not_blackhole.result
      mysql-test/std_data/intersect-bug50389.tsv
      mysql-test/std_data/parts/t1_blackhole.frm
      mysql-test/std_data/parts/t1_blackhole.par
      mysql-test/suite/binlog/r/binlog_mixed_load_data.result
      mysql-test/suite/binlog/t/binlog_mixed_load_data.test
      mysql-test/suite/innodb/r/innodb_bug48024.result
      mysql-test/suite/innodb/r/innodb_bug49164.result
      mysql-test/suite/innodb/r/innodb_bug53674.result
      mysql-test/suite/innodb/r/innodb_bug53756.result
      mysql-test/suite/innodb/r/innodb_bug54044.result
      mysql-test/suite/innodb/r/innodb_multi_update.result
      mysql-test/suite/innodb/t/innodb_bug48024.test
      mysql-test/suite/innodb/t/innodb_bug49164.test
      mysql-test/suite/innodb/t/innodb_bug53674-master.opt
      mysql-test/suite/innodb/t/innodb_bug53674.test
      mysql-test/suite/innodb/t/innodb_bug53756-master.opt
      mysql-test/suite/innodb/t/innodb_bug53756.test
      mysql-test/suite/innodb/t/innodb_bug54044.test
      mysql-test/suite/innodb/t/innodb_multi_update.test
      mysql-test/suite/innodb_plugin/r/innodb-autoinc-optimize.result
      mysql-test/suite/innodb_plugin/r/innodb-ucs2.result
      mysql-test/suite/innodb_plugin/r/innodb_autoinc_lock_mode_zero.result
      mysql-test/suite/innodb_plugin/r/innodb_bug30919.result
      mysql-test/suite/innodb_plugin/r/innodb_bug42419.result
      mysql-test/suite/innodb_plugin/r/innodb_bug48024.result
      mysql-test/suite/innodb_plugin/r/innodb_bug49164.result
      mysql-test/suite/innodb_plugin/r/innodb_bug53290.result
      mysql-test/suite/innodb_plugin/r/innodb_bug53591.result
      mysql-test/suite/innodb_plugin/r/innodb_bug53592.result
      mysql-test/suite/innodb_plugin/r/innodb_bug53674.result
      mysql-test/suite/innodb_plugin/r/innodb_bug54044.result
      mysql-test/suite/innodb_plugin/r/innodb_bug54453.result
      mysql-test/suite/innodb_plugin/r/innodb_bug54679.result
      mysql-test/suite/innodb_plugin/r/innodb_gis.result
      mysql-test/suite/innodb_plugin/r/innodb_lock_wait_timeout_1.result
      mysql-test/suite/innodb_plugin/r/innodb_multi_update.result
      mysql-test/suite/innodb_plugin/r/innodb_mysql.result
      mysql-test/suite/innodb_plugin/r/innodb_mysql_rbk.result
      mysql-test/suite/innodb_plugin/r/innodb_notembedded.result
      mysql-test/suite/innodb_plugin/r/innodb_timeout_rollback.result
      mysql-test/suite/innodb_plugin/t/disabled.def
      mysql-test/suite/innodb_plugin/t/innodb-autoinc-optimize.test
      mysql-test/suite/innodb_plugin/t/innodb-ucs2.test
      mysql-test/suite/innodb_plugin/t/innodb_autoinc_lock_mode_zero-master.opt
      mysql-test/suite/innodb_plugin/t/innodb_autoinc_lock_mode_zero.test
      mysql-test/suite/innodb_plugin/t/innodb_bug30919-master.opt
      mysql-test/suite/innodb_plugin/t/innodb_bug30919.test
      mysql-test/suite/innodb_plugin/t/innodb_bug42419.test
      mysql-test/suite/innodb_plugin/t/innodb_bug48024.test
      mysql-test/suite/innodb_plugin/t/innodb_bug49164.test
      mysql-test/suite/innodb_plugin/t/innodb_bug53290.test
      mysql-test/suite/innodb_plugin/t/innodb_bug53591.test
      mysql-test/suite/innodb_plugin/t/innodb_bug53592.test
      mysql-test/suite/innodb_plugin/t/innodb_bug53674-master.opt
      mysql-test/suite/innodb_plugin/t/innodb_bug53674.test
      mysql-test/suite/innodb_plugin/t/innodb_bug54044.test
      mysql-test/suite/innodb_plugin/t/innodb_bug54453.test
      mysql-test/suite/innodb_plugin/t/innodb_bug54679.test
      mysql-test/suite/innodb_plugin/t/innodb_gis.test
      mysql-test/suite/innodb_plugin/t/innodb_lock_wait_timeout_1-master.opt
      mysql-test/suite/innodb_plugin/t/innodb_lock_wait_timeout_1.test
      mysql-test/suite/innodb_plugin/t/innodb_multi_update.test
      mysql-test/suite/innodb_plugin/t/innodb_mysql-master.opt
      mysql-test/suite/innodb_plugin/t/innodb_mysql.test
      mysql-test/suite/innodb_plugin/t/innodb_mysql_rbk-master.opt
      mysql-test/suite/innodb_plugin/t/innodb_mysql_rbk.test
      mysql-test/suite/innodb_plugin/t/innodb_notembedded.test
      mysql-test/suite/innodb_plugin/t/innodb_timeout_rollback-master.opt
      mysql-test/suite/innodb_plugin/t/innodb_timeout_rollback.test
      mysql-test/suite/parts/r/partition_debug_sync_innodb.result
      mysql-test/suite/parts/t/partition_debug_sync_innodb-master.opt
      mysql-test/suite/parts/t/partition_debug_sync_innodb.test
      mysql-test/suite/rpl/r/rpl_conditional_comments.result
      mysql-test/suite/rpl/r/rpl_current_user.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_stm_create_if_not_exists.result
      mysql-test/suite/rpl/t/rpl_conditional_comments.test
      mysql-test/suite/rpl/t/rpl_current_user.cnf
      mysql-test/suite/rpl/t/rpl_current_user.test
      mysql-test/suite/rpl/t/rpl_row_rec_comp_innodb.test
      mysql-test/suite/rpl/t/rpl_row_rec_comp_myisam.test
      mysql-test/suite/rpl/t/rpl_stm_create_if_not_exists.test
      mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_tables.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables-master.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables.test
      mysql-test/t/innodb_mysql_lock2.test
      mysql-test/t/lock_sync.test
      mysql-test/t/mysqlhotcopy_archive.test
      mysql-test/t/mysqlhotcopy_myisam.test
      mysql-test/t/partition_not_blackhole-master.opt
      mysql-test/t/partition_not_blackhole.test
      mysql-test/t/ssl_8k_key-master.opt
      storage/ndb/include/kernel/signaldata/Sync.hpp
      storage/ndb/src/ndbapi/trp_client.cpp
      storage/ndb/src/ndbapi/trp_node.cpp
      storage/ndb/src/ndbapi/trp_node.hpp
      unittest/strings/
      unittest/strings/Makefile.am
      unittest/strings/strings-t.c
    renamed:
      mysql-test/r/innodb-autoinc-optimize.result => mysql-test/suite/innodb/r/innodb-autoinc-optimize.result
      mysql-test/r/innodb-ucs2.result => mysql-test/suite/innodb/r/innodb-ucs2.result
      mysql-test/r/innodb_autoinc_lock_mode_zero.result => mysql-test/suite/innodb/r/innodb_autoinc_lock_mode_zero.result
      mysql-test/r/innodb_bug30919.result => mysql-test/suite/innodb/r/innodb_bug30919.result
      mysql-test/r/innodb_bug42419.result => mysql-test/suite/innodb/r/innodb_bug42419.result
      mysql-test/r/innodb_gis.result => mysql-test/suite/innodb/r/innodb_gis.result
      mysql-test/r/innodb_lock_wait_timeout_1.result => mysql-test/suite/innodb/r/innodb_lock_wait_timeout_1.result
      mysql-test/r/innodb_mysql.result => mysql-test/suite/innodb/r/innodb_mysql.result
      mysql-test/r/innodb_mysql_rbk.result => mysql-test/suite/innodb/r/innodb_mysql_rbk.result
      mysql-test/r/innodb_notembedded.result => mysql-test/suite/innodb/r/innodb_notembedded.result
      mysql-test/r/innodb_timeout_rollback.result => mysql-test/suite/innodb/r/innodb_timeout_rollback.result
      mysql-test/suite/rpl/r/rpl_row_disabled_slave_key.result => mysql-test/suite/rpl/r/rpl_row_find_row.result
      mysql-test/suite/rpl/t/rpl_row_disabled_slave_key.test => mysql-test/suite/rpl/t/rpl_row_find_row.test
      mysql-test/t/innodb-autoinc-optimize.test => mysql-test/suite/innodb/t/innodb-autoinc-optimize.test
      mysql-test/t/innodb-ucs2.test => mysql-test/suite/innodb/t/innodb-ucs2.test
      mysql-test/t/innodb_autoinc_lock_mode_zero-master.opt => mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero-master.opt
      mysql-test/t/innodb_autoinc_lock_mode_zero.test => mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test
      mysql-test/t/innodb_bug30919-master.opt => mysql-test/suite/innodb/t/innodb_bug30919-master.opt
      mysql-test/t/innodb_bug30919.test => mysql-test/suite/innodb/t/innodb_bug30919.test
      mysql-test/t/innodb_bug42419.test => mysql-test/suite/innodb/t/innodb_bug42419.test
      mysql-test/t/innodb_gis.test => mysql-test/suite/innodb/t/innodb_gis.test
      mysql-test/t/innodb_lock_wait_timeout_1-master.opt => mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1-master.opt
      mysql-test/t/innodb_lock_wait_timeout_1.test => mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test
      mysql-test/t/innodb_mysql-master.opt => mysql-test/suite/innodb/t/innodb_mysql-master.opt
      mysql-test/t/innodb_mysql.test => mysql-test/suite/innodb/t/innodb_mysql.test
      mysql-test/t/innodb_mysql_rbk-master.opt => mysql-test/suite/innodb/t/innodb_mysql_rbk-master.opt
      mysql-test/t/innodb_mysql_rbk.test => mysql-test/suite/innodb/t/innodb_mysql_rbk.test
      mysql-test/t/innodb_notembedded.test => mysql-test/suite/innodb/t/innodb_notembedded.test
      mysql-test/t/innodb_timeout_rollback-master.opt => mysql-test/suite/innodb/t/innodb_timeout_rollback-master.opt
      mysql-test/t/innodb_timeout_rollback.test => mysql-test/suite/innodb/t/innodb_timeout_rollback.test
    modified:
      BUILD/SETUP.sh
      BUILD/build_mccge.sh
      BUILD/check-cpu
      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
      Makefile.am
      README
      client/mysql.cc
      client/mysql_upgrade.c
      client/mysqladmin.cc
      client/mysqlbinlog.cc
      client/mysqlcheck.c
      client/mysqldump.c
      client/mysqlimport.c
      client/mysqlshow.c
      client/mysqlslap.c
      client/mysqltest.cc
      client/sql_string.cc
      cmd-line-utils/readline/Makefile.am
      cmd-line-utils/readline/input.c
      config/ac-macros/ssl.m4
      configure.in
      extra/comp_err.c
      extra/my_print_defaults.c
      extra/mysql_waitpid.c
      extra/perror.c
      extra/replace.c
      extra/resolve_stack_dump.c
      extra/resolveip.c
      extra/yassl/CMakeLists.txt
      extra/yassl/certs/ca-cert.pem
      extra/yassl/certs/client-cert.der
      extra/yassl/certs/client-cert.pem
      extra/yassl/certs/dsa-cert.pem
      extra/yassl/certs/server-cert.pem
      extra/yassl/include/lock.hpp
      extra/yassl/src/Makefile.am
      extra/yassl/src/crypto_wrapper.cpp
      extra/yassl/src/lock.cpp
      extra/yassl/src/yassl_imp.cpp
      extra/yassl/taocrypt/CMakeLists.txt
      extra/yassl/taocrypt/benchmark/Makefile.am
      extra/yassl/taocrypt/include/blowfish.hpp
      extra/yassl/taocrypt/include/runtime.hpp
      extra/yassl/taocrypt/src/Makefile.am
      extra/yassl/taocrypt/src/aes.cpp
      extra/yassl/taocrypt/src/algebra.cpp
      extra/yassl/taocrypt/src/blowfish.cpp
      extra/yassl/taocrypt/src/coding.cpp
      extra/yassl/taocrypt/src/integer.cpp
      extra/yassl/taocrypt/src/misc.cpp
      extra/yassl/taocrypt/src/twofish.cpp
      extra/yassl/taocrypt/test/Makefile.am
      extra/yassl/taocrypt/test/memory.cpp
      extra/yassl/testsuite/Makefile.am
      extra/yassl/testsuite/test.hpp
      include/Makefile.am
      include/m_string.h
      include/my_alarm.h
      include/my_getopt.h
      include/my_global.h
      include/my_pthread.h
      include/my_sys.h
      include/myisam.h
      include/mysql.h
      include/mysql.h.pp
      include/mysys_err.h
      include/sslopt-longopts.h
      libmysql/Makefile.shared
      libmysql/libmysql.c
      libmysqld/examples/Makefile.am
      mysql-test/collections/default.experimental
      mysql-test/extra/binlog_tests/binlog.test
      mysql-test/extra/binlog_tests/blackhole.test
      mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test
      mysql-test/extra/rpl_tests/rpl_deadlock.test
      mysql-test/extra/rpl_tests/rpl_flsh_tbls.test
      mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test
      mysql-test/extra/rpl_tests/rpl_insert_delayed.test
      mysql-test/extra/rpl_tests/rpl_loaddata.test
      mysql-test/extra/rpl_tests/rpl_log.test
      mysql-test/extra/rpl_tests/rpl_max_relay_size.test
      mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test
      mysql-test/extra/rpl_tests/rpl_reset_slave.test
      mysql-test/extra/rpl_tests/rpl_row_basic.test
      mysql-test/extra/rpl_tests/rpl_row_tabledefs.test
      mysql-test/include/commit.inc
      mysql-test/include/diff_tables.inc
      mysql-test/include/have_innodb_plugin.inc
      mysql-test/include/mix2.inc
      mysql-test/include/rpl_stmt_seq.inc
      mysql-test/include/show_binlog_events.inc
      mysql-test/include/show_rpl_debug_info.inc
      mysql-test/include/show_slave_status.inc
      mysql-test/include/test_fieldsize.inc
      mysql-test/include/wait_for_binlog_event.inc
      mysql-test/include/wait_for_slave_io_error.inc
      mysql-test/include/wait_for_slave_sql_error.inc
      mysql-test/include/wait_for_slave_sql_error_and_skip.inc
      mysql-test/include/wait_for_status_var.inc
      mysql-test/include/wait_until_count_sessions.inc
      mysql-test/lib/My/Config.pm
      mysql-test/lib/My/ConfigFactory.pm
      mysql-test/lib/My/SafeProcess.pm
      mysql-test/lib/My/SafeProcess/safe_process.cc
      mysql-test/lib/mtr_cases.pm
      mysql-test/lib/mtr_misc.pl
      mysql-test/lib/mtr_report.pm
      mysql-test/lib/v1/mtr_process.pl
      mysql-test/mysql-test-run.pl
      mysql-test/r/alter_table-big.result
      mysql-test/r/bug39022.result
      mysql-test/r/commit_1innodb.result
      mysql-test/r/create-big.result
      mysql-test/r/csv.result
      mysql-test/r/ctype_cp932_binlog_stm.result
      mysql-test/r/delete.result
      mysql-test/r/error_simulation.result
      mysql-test/r/events_scheduling.result
      mysql-test/r/explain.result
      mysql-test/r/flush_block_commit_notembedded.result
      mysql-test/r/func_gconcat.result
      mysql-test/r/func_group.result
      mysql-test/r/func_in.result
      mysql-test/r/func_isnull.result
      mysql-test/r/func_like.result
      mysql-test/r/func_misc.result
      mysql-test/r/func_sapdb.result
      mysql-test/r/func_time.result
      mysql-test/r/gis.result
      mysql-test/r/group_by.result
      mysql-test/r/group_min_max.result
      mysql-test/r/handler_myisam.result
      mysql-test/r/having.result
      mysql-test/r/information_schema.result
      mysql-test/r/insert.result
      mysql-test/r/join.result
      mysql-test/r/join_outer.result
      mysql-test/r/loaddata.result
      mysql-test/r/log_state.result
      mysql-test/r/lowercase_table2.result
      mysql-test/r/lowercase_view.result
      mysql-test/r/multi_update.result
      mysql-test/r/mysql_client_test.result
      mysql-test/r/mysql_upgrade.result
      mysql-test/r/mysqldump.result
      mysql-test/r/mysqltest.result
      mysql-test/r/outfile_loaddata.result
      mysql-test/r/partition_error.result
      mysql-test/r/partition_range.result
      mysql-test/r/range.result
      mysql-test/r/renamedb.result
      mysql-test/r/schema.result
      mysql-test/r/select.result
      mysql-test/r/sp_trans_log.result
      mysql-test/r/subselect.result
      mysql-test/r/subselect4.result
      mysql-test/r/timezone2.result
      mysql-test/r/trigger.result
      mysql-test/r/type_time.result
      mysql-test/r/update.result
      mysql-test/r/upgrade.result
      mysql-test/r/user_var.result
      mysql-test/r/variables.result
      mysql-test/std_data/server8k-cert.pem
      mysql-test/std_data/server8k-key.pem
      mysql-test/suite/binlog/r/binlog_base64_flag.result
      mysql-test/suite/binlog/r/binlog_innodb.result
      mysql-test/suite/binlog/r/binlog_row_binlog.result
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
      mysql-test/suite/binlog/r/binlog_stm_binlog.result
      mysql-test/suite/binlog/r/binlog_stm_blackhole.result
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
      mysql-test/suite/binlog/t/binlog_base64_flag.test
      mysql-test/suite/binlog/t/binlog_innodb.test
      mysql-test/suite/binlog/t/binlog_killed.test
      mysql-test/suite/binlog/t/binlog_killed_simulate.test
      mysql-test/suite/binlog/t/binlog_stm_binlog.test
      mysql-test/suite/binlog/t/binlog_stm_blackhole.test
      mysql-test/suite/bugs/r/rpl_bug12691.result
      mysql-test/suite/bugs/r/rpl_bug36391.result
      mysql-test/suite/bugs/t/rpl_bug12691.test
      mysql-test/suite/bugs/t/rpl_bug36391.test
      mysql-test/suite/engines/funcs/r/rpl_000015.result
      mysql-test/suite/engines/funcs/r/rpl_REDIRECT.result
      mysql-test/suite/engines/funcs/r/rpl_change_master.result
      mysql-test/suite/engines/funcs/r/rpl_empty_master_crash.result
      mysql-test/suite/engines/funcs/r/rpl_flushlog_loop.result
      mysql-test/suite/engines/funcs/r/rpl_loaddata_s.result
      mysql-test/suite/engines/funcs/r/rpl_log_pos.result
      mysql-test/suite/engines/funcs/r/rpl_rbr_to_sbr.result
      mysql-test/suite/engines/funcs/r/rpl_row_drop.result
      mysql-test/suite/engines/funcs/r/rpl_row_inexist_tbl.result
      mysql-test/suite/engines/funcs/r/rpl_row_max_relay_size.result
      mysql-test/suite/engines/funcs/r/rpl_row_reset_slave.result
      mysql-test/suite/engines/funcs/r/rpl_row_until.result
      mysql-test/suite/engines/funcs/r/rpl_server_id1.result
      mysql-test/suite/engines/funcs/r/rpl_server_id2.result
      mysql-test/suite/engines/funcs/r/rpl_slave_status.result
      mysql-test/suite/engines/funcs/r/rpl_stm_max_relay_size.result
      mysql-test/suite/engines/funcs/r/rpl_stm_reset_slave.result
      mysql-test/suite/engines/funcs/r/rpl_switch_stm_row_mixed.result
      mysql-test/suite/engines/funcs/t/rpl_000015.test
      mysql-test/suite/engines/funcs/t/rpl_REDIRECT.test
      mysql-test/suite/engines/funcs/t/rpl_change_master.test
      mysql-test/suite/engines/funcs/t/rpl_empty_master_crash.test
      mysql-test/suite/engines/funcs/t/rpl_flushlog_loop.test
      mysql-test/suite/engines/funcs/t/rpl_loaddata_s.test
      mysql-test/suite/engines/funcs/t/rpl_log_pos.test
      mysql-test/suite/engines/funcs/t/rpl_rbr_to_sbr.test
      mysql-test/suite/engines/funcs/t/rpl_row_drop.test
      mysql-test/suite/engines/funcs/t/rpl_row_inexist_tbl.test
      mysql-test/suite/engines/funcs/t/rpl_row_until.test
      mysql-test/suite/engines/funcs/t/rpl_server_id1.test
      mysql-test/suite/engines/funcs/t/rpl_server_id2.test
      mysql-test/suite/engines/funcs/t/rpl_slave_status.test
      mysql-test/suite/engines/funcs/t/rpl_switch_stm_row_mixed.test
      mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
      mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
      mysql-test/suite/funcs_1/r/innodb_trig_03.result
      mysql-test/suite/funcs_1/r/innodb_trig_03e.result
      mysql-test/suite/funcs_1/r/innodb_trig_0407.result
      mysql-test/suite/funcs_1/r/innodb_trig_08.result
      mysql-test/suite/funcs_1/r/is_basics_mixed.result
      mysql-test/suite/funcs_1/r/is_columns_innodb.result
      mysql-test/suite/funcs_1/r/is_columns_is.result
      mysql-test/suite/funcs_1/r/is_columns_memory.result
      mysql-test/suite/funcs_1/r/is_columns_myisam.result
      mysql-test/suite/funcs_1/r/is_columns_mysql.result
      mysql-test/suite/funcs_1/r/memory_storedproc_06.result
      mysql-test/suite/funcs_1/r/memory_storedproc_10.result
      mysql-test/suite/funcs_1/r/memory_trig_03.result
      mysql-test/suite/funcs_1/r/memory_trig_03e.result
      mysql-test/suite/funcs_1/r/memory_trig_0407.result
      mysql-test/suite/funcs_1/r/memory_trig_08.result
      mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
      mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
      mysql-test/suite/funcs_1/r/myisam_trig_03.result
      mysql-test/suite/funcs_1/r/myisam_trig_03e.result
      mysql-test/suite/funcs_1/r/myisam_trig_0407.result
      mysql-test/suite/funcs_1/r/myisam_trig_08.result
      mysql-test/suite/funcs_1/r/ndb_storedproc_06.result
      mysql-test/suite/funcs_1/r/ndb_storedproc_10.result
      mysql-test/suite/funcs_1/r/ndb_trig_03.result
      mysql-test/suite/funcs_1/r/ndb_trig_03e.result
      mysql-test/suite/funcs_1/r/ndb_trig_0407.result
      mysql-test/suite/funcs_1/r/ndb_trig_08.result
      mysql-test/suite/funcs_1/r/storedproc.result
      mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
      mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
      mysql-test/suite/funcs_1/triggers/triggers_03.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_columns.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_db_level.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_db_table_mix.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_definer.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_global_db_mix.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_prepare.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_table_level.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_transaction.inc
      mysql-test/suite/funcs_1/triggers/triggers_0407.inc
      mysql-test/suite/funcs_1/triggers/triggers_08.inc
      mysql-test/suite/innodb/r/innodb-autoinc.result
      mysql-test/suite/innodb/r/innodb.result
      mysql-test/suite/innodb/t/disabled.def
      mysql-test/suite/innodb/t/innodb-autoinc.test
      mysql-test/suite/innodb/t/innodb.test
      mysql-test/suite/innodb_plugin/r/innodb-autoinc.result
      mysql-test/suite/innodb_plugin/r/innodb.result
      mysql-test/suite/innodb_plugin/t/innodb-autoinc.test
      mysql-test/suite/innodb_plugin/t/innodb.test
      mysql-test/suite/manual/r/rpl_replication_delay.result
      mysql-test/suite/manual/t/rpl_replication_delay.test
      mysql-test/suite/ndb/r/ndb_basic.result
      mysql-test/suite/ndb/r/ndb_bulk_delete.result
      mysql-test/suite/ndb/r/ndb_config.result
      mysql-test/suite/ndb/r/ndb_index_ordered.result
      mysql-test/suite/ndb/r/ndb_mgm.result
      mysql-test/suite/ndb/r/ndb_restore.result
      mysql-test/suite/ndb/t/ndb_bulk_delete.test
      mysql-test/suite/ndb/t/ndb_index_ordered.test
      mysql-test/suite/ndb/t/ndb_mgm.test
      mysql-test/suite/ndb/t/ndb_restore.test
      mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result
      mysql-test/suite/parts/r/rpl_partition.result
      mysql-test/suite/parts/t/rpl_partition.test
      mysql-test/suite/rpl/include/rpl_mixed_ddl.inc
      mysql-test/suite/rpl/include/rpl_mixed_dml.inc
      mysql-test/suite/rpl/r/rpl_binlog_grant.result
      mysql-test/suite/rpl/r/rpl_bug33931.result
      mysql-test/suite/rpl/r/rpl_change_master.result
      mysql-test/suite/rpl/r/rpl_create_if_not_exists.result
      mysql-test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result
      mysql-test/suite/rpl/r/rpl_deadlock_innodb.result
      mysql-test/suite/rpl/r/rpl_do_grant.result
      mysql-test/suite/rpl/r/rpl_drop.result
      mysql-test/suite/rpl/r/rpl_dual_pos_advance.result
      mysql-test/suite/rpl/r/rpl_empty_master_crash.result
      mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result
      mysql-test/suite/rpl/r/rpl_flushlog_loop.result
      mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result
      mysql-test/suite/rpl/r/rpl_grant.result
      mysql-test/suite/rpl/r/rpl_heartbeat.result
      mysql-test/suite/rpl/r/rpl_incident.result
      mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result
      mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
      mysql-test/suite/rpl/r/rpl_known_bugs_detection.result
      mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
      mysql-test/suite/rpl/r/rpl_log_pos.result
      mysql-test/suite/rpl/r/rpl_packet.result
      mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result
      mysql-test/suite/rpl/r/rpl_replicate_do.result
      mysql-test/suite/rpl/r/rpl_rotate_logs.result
      mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result
      mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
      mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
      mysql-test/suite/rpl/r/rpl_row_colSize.result
      mysql-test/suite/rpl/r/rpl_row_create_table.result
      mysql-test/suite/rpl/r/rpl_row_drop.result
      mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result
      mysql-test/suite/rpl/r/rpl_row_log.result
      mysql-test/suite/rpl/r/rpl_row_log_innodb.result
      mysql-test/suite/rpl/r/rpl_row_max_relay_size.result
      mysql-test/suite/rpl/r/rpl_row_reset_slave.result
      mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result
      mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result
      mysql-test/suite/rpl/r/rpl_row_until.result
      mysql-test/suite/rpl/r/rpl_skip_error.result
      mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
      mysql-test/suite/rpl/r/rpl_slave_skip.result
      mysql-test/suite/rpl/r/rpl_sp.result
      mysql-test/suite/rpl/r/rpl_ssl.result
      mysql-test/suite/rpl/r/rpl_ssl1.result
      mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result
      mysql-test/suite/rpl/r/rpl_stm_insert_delayed.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_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_stm_reset_slave.result
      mysql-test/suite/rpl/r/rpl_stm_until.result
      mysql-test/suite/rpl/r/rpl_temporary_errors.result
      mysql-test/suite/rpl/t/disabled.def
      mysql-test/suite/rpl/t/rpl_binlog_grant.test
      mysql-test/suite/rpl/t/rpl_bug33931.test
      mysql-test/suite/rpl/t/rpl_change_master.test
      mysql-test/suite/rpl/t/rpl_create_if_not_exists.test
      mysql-test/suite/rpl/t/rpl_critical_errors.test
      mysql-test/suite/rpl/t/rpl_do_grant.test
      mysql-test/suite/rpl/t/rpl_drop.test
      mysql-test/suite/rpl/t/rpl_dual_pos_advance.test
      mysql-test/suite/rpl/t/rpl_empty_master_crash.test
      mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test
      mysql-test/suite/rpl/t/rpl_flushlog_loop.test
      mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
      mysql-test/suite/rpl/t/rpl_grant.test
      mysql-test/suite/rpl/t/rpl_heartbeat.test
      mysql-test/suite/rpl/t/rpl_incident.test
      mysql-test/suite/rpl/t/rpl_known_bugs_detection.test
      mysql-test/suite/rpl/t/rpl_loaddata_fatal.test
      mysql-test/suite/rpl/t/rpl_loaddata_map.test
      mysql-test/suite/rpl/t/rpl_log_pos.test
      mysql-test/suite/rpl/t/rpl_packet.test
      mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test
      mysql-test/suite/rpl/t/rpl_replicate_do.test
      mysql-test/suite/rpl/t/rpl_rotate_logs.test
      mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test
      mysql-test/suite/rpl/t/rpl_row_create_table.test
      mysql-test/suite/rpl/t/rpl_row_drop.test
      mysql-test/suite/rpl/t/rpl_row_until.test
      mysql-test/suite/rpl/t/rpl_skip_error.test
      mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
      mysql-test/suite/rpl/t/rpl_slave_skip.test
      mysql-test/suite/rpl/t/rpl_sp.test
      mysql-test/suite/rpl/t/rpl_ssl.test
      mysql-test/suite/rpl/t/rpl_ssl1.test
      mysql-test/suite/rpl/t/rpl_stm_log.test
      mysql-test/suite/rpl/t/rpl_stm_mixing_engines.test
      mysql-test/suite/rpl/t/rpl_stm_until.test
      mysql-test/suite/rpl/t/rpl_temporary_errors.test
      mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test
      mysql-test/suite/rpl_ndb/my.cnf
      mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_mix_eng_trans.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result
      mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result
      mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result
      mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_idempotent.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_eng_trans.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test
      mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb.test
      mysql-test/suite/sys_vars/r/slow_query_log_func.result
      mysql-test/suite/sys_vars/r/tx_isolation_func.result
      mysql-test/suite/sys_vars/t/slow_query_log_func.test
      mysql-test/suite/sys_vars/t/tx_isolation_func.test
      mysql-test/t/alter_table-big.test
      mysql-test/t/bug39022.test
      mysql-test/t/create-big.test
      mysql-test/t/csv.test
      mysql-test/t/ctype_cp932_binlog_stm.test
      mysql-test/t/delete.test
      mysql-test/t/disabled.def
      mysql-test/t/error_simulation.test
      mysql-test/t/events_scheduling.test
      mysql-test/t/explain.test
      mysql-test/t/flush_block_commit_notembedded.test
      mysql-test/t/func_gconcat.test
      mysql-test/t/func_group.test
      mysql-test/t/func_in.test
      mysql-test/t/func_isnull.test
      mysql-test/t/func_like.test
      mysql-test/t/func_misc.test
      mysql-test/t/func_time.test
      mysql-test/t/gis.test
      mysql-test/t/group_by.test
      mysql-test/t/group_min_max.test
      mysql-test/t/handler_myisam.test
      mysql-test/t/having.test
      mysql-test/t/information_schema.test
      mysql-test/t/insert.test
      mysql-test/t/join.test
      mysql-test/t/join_outer.test
      mysql-test/t/loaddata.test
      mysql-test/t/log_state.test
      mysql-test/t/lowercase_view.test
      mysql-test/t/multi_update.test
      mysql-test/t/mysql_client_test.test
      mysql-test/t/mysql_upgrade.test
      mysql-test/t/mysqlbinlog.test
      mysql-test/t/mysqldump.test
      mysql-test/t/mysqltest.test
      mysql-test/t/outfile_loaddata.test
      mysql-test/t/partition_error.test
      mysql-test/t/partition_range.test
      mysql-test/t/range.test
      mysql-test/t/renamedb.test
      mysql-test/t/schema.test
      mysql-test/t/select.test
      mysql-test/t/sp_trans_log.test
      mysql-test/t/subselect.test
      mysql-test/t/subselect4.test
      mysql-test/t/timezone2.test
      mysql-test/t/type_time.test
      mysql-test/t/update.test
      mysql-test/t/upgrade.test
      mysql-test/t/user_var.test
      mysql-test/t/variables.test
      mysql-test/valgrind.supp
      mysys/Makefile.am
      mysys/errors.c
      mysys/mf_iocache.c
      mysys/mf_loadpath.c
      mysys/mf_pack.c
      mysys/mf_wfile.c
      mysys/my_alloc.c
      mysys/my_bitmap.c
      mysys/my_copy.c
      mysys/my_gethwaddr.c
      mysys/my_getopt.c
      mysys/my_handler.c
      mysys/my_malloc.c
      mysys/my_redel.c
      mysys/safemalloc.c
      mysys/stacktrace.c
      mysys/thr_alarm.c
      mysys/thr_lock.c
      plugin/daemon_example/Makefile.am
      regex/engine.c
      regex/regcomp.c
      scripts/make_binary_distribution.sh
      scripts/make_win_bin_dist
      scripts/mysql_secure_installation.pl.in
      scripts/mysql_secure_installation.sh
      scripts/mysql_system_tables_fix.sql
      server-tools/instance-manager/instance_options.cc
      server-tools/instance-manager/options.cc
      sql-common/client.c
      sql-common/my_time.c
      sql/authors.h
      sql/event_data_objects.cc
      sql/field.cc
      sql/filesort.cc
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_binlog.cc
      sql/ha_partition.cc
      sql/ha_partition.h
      sql/handler.cc
      sql/handler.h
      sql/item.cc
      sql/item.h
      sql/item_buff.cc
      sql/item_cmpfunc.cc
      sql/item_cmpfunc.h
      sql/item_create.cc
      sql/item_func.cc
      sql/item_func.h
      sql/item_geofunc.h
      sql/item_subselect.cc
      sql/item_sum.cc
      sql/item_sum.h
      sql/item_timefunc.cc
      sql/item_timefunc.h
      sql/log.cc
      sql/log.h
      sql/log_event.cc
      sql/log_event.h
      sql/log_event_old.cc
      sql/my_decimal.cc
      sql/mysql_priv.h
      sql/mysqld.cc
      sql/net_serv.cc
      sql/opt_range.cc
      sql/opt_range.h
      sql/opt_sum.cc
      sql/partition_info.cc
      sql/protocol.cc
      sql/repl_failsafe.cc
      sql/rpl_mi.cc
      sql/rpl_mi.h
      sql/rpl_rli.cc
      sql/set_var.cc
      sql/set_var.h
      sql/slave.cc
      sql/sp.cc
      sql/sp_head.cc
      sql/spatial.cc
      sql/spatial.h
      sql/sql_acl.cc
      sql/sql_analyse.cc
      sql/sql_base.cc
      sql/sql_binlog.cc
      sql/sql_cache.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_connect.cc
      sql/sql_cursor.cc
      sql/sql_db.cc
      sql/sql_delete.cc
      sql/sql_derived.cc
      sql/sql_handler.cc
      sql/sql_insert.cc
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_list.h
      sql/sql_load.cc
      sql/sql_olap.cc
      sql/sql_parse.cc
      sql/sql_partition.cc
      sql/sql_partition.h
      sql/sql_plugin.cc
      sql/sql_prepare.cc
      sql/sql_repl.cc
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_show.cc
      sql/sql_string.cc
      sql/sql_string.h
      sql/sql_table.cc
      sql/sql_trigger.cc
      sql/sql_union.cc
      sql/sql_update.cc
      sql/sql_view.cc
      sql/sql_yacc.yy
      sql/table.cc
      sql/table.h
      sql/thr_malloc.cc
      sql/tztime.cc
      sql/udf_example.c
      sql/unireg.cc
      sql/unireg.h
      storage/archive/Makefile.am
      storage/archive/archive_reader.c
      storage/blackhole/Makefile.am
      storage/csv/Makefile.am
      storage/csv/ha_tina.cc
      storage/example/Makefile.am
      storage/example/ha_example.cc
      storage/federated/Makefile.am
      storage/federated/ha_federated.cc
      storage/heap/hp_hash.c
      storage/heap/hp_test2.c
      storage/ibmdb2i/Makefile.am
      storage/ibmdb2i/db2i_file.h
      storage/innobase/Makefile.am
      storage/innobase/buf/buf0flu.c
      storage/innobase/dict/dict0dict.c
      storage/innobase/dict/dict0load.c
      storage/innobase/fil/fil0fil.c
      storage/innobase/fsp/fsp0fsp.c
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/ha_innodb.h
      storage/innobase/include/db0err.h
      storage/innobase/include/dict0dict.h
      storage/innobase/include/dict0dict.ic
      storage/innobase/include/dict0load.h
      storage/innobase/include/dict0mem.h
      storage/innobase/include/fil0fil.h
      storage/innobase/include/lock0lock.h
      storage/innobase/include/mach0data.ic
      storage/innobase/include/que0que.h
      storage/innobase/include/row0mysql.h
      storage/innobase/include/sync0sync.h
      storage/innobase/include/trx0trx.h
      storage/innobase/include/univ.i
      storage/innobase/lock/lock0lock.c
      storage/innobase/os/os0file.c
      storage/innobase/row/row0ins.c
      storage/innobase/row/row0mysql.c
      storage/innobase/row/row0sel.c
      storage/innobase/row/row0undo.c
      storage/innobase/srv/srv0srv.c
      storage/innobase/srv/srv0start.c
      storage/innobase/trx/trx0trx.c
      storage/innodb_plugin/ChangeLog
      storage/innodb_plugin/Makefile.am
      storage/innodb_plugin/btr/btr0btr.c
      storage/innodb_plugin/btr/btr0cur.c
      storage/innodb_plugin/btr/btr0sea.c
      storage/innodb_plugin/buf/buf0buddy.c
      storage/innodb_plugin/buf/buf0buf.c
      storage/innodb_plugin/buf/buf0flu.c
      storage/innodb_plugin/buf/buf0lru.c
      storage/innodb_plugin/dict/dict0boot.c
      storage/innodb_plugin/dict/dict0crea.c
      storage/innodb_plugin/dict/dict0dict.c
      storage/innodb_plugin/dict/dict0load.c
      storage/innodb_plugin/dict/dict0mem.c
      storage/innodb_plugin/fil/fil0fil.c
      storage/innodb_plugin/fsp/fsp0fsp.c
      storage/innodb_plugin/ha/ha0ha.c
      storage/innodb_plugin/handler/ha_innodb.cc
      storage/innodb_plugin/handler/ha_innodb.h
      storage/innodb_plugin/handler/handler0alter.cc
      storage/innodb_plugin/include/btr0cur.h
      storage/innodb_plugin/include/btr0sea.h
      storage/innodb_plugin/include/buf0buf.ic
      storage/innodb_plugin/include/buf0lru.h
      storage/innodb_plugin/include/db0err.h
      storage/innodb_plugin/include/dict0boot.h
      storage/innodb_plugin/include/dict0dict.h
      storage/innodb_plugin/include/dict0dict.ic
      storage/innodb_plugin/include/dict0load.h
      storage/innodb_plugin/include/dict0mem.h
      storage/innodb_plugin/include/fil0fil.h
      storage/innodb_plugin/include/ha0ha.h
      storage/innodb_plugin/include/ha_prototypes.h
      storage/innodb_plugin/include/lock0lock.h
      storage/innodb_plugin/include/log0log.ic
      storage/innodb_plugin/include/mach0data.ic
      storage/innodb_plugin/include/mem0pool.h
      storage/innodb_plugin/include/que0que.h
      storage/innodb_plugin/include/rem0cmp.h
      storage/innodb_plugin/include/row0mysql.h
      storage/innodb_plugin/include/sync0rw.h
      storage/innodb_plugin/include/sync0sync.h
      storage/innodb_plugin/include/trx0trx.h
      storage/innodb_plugin/include/univ.i
      storage/innodb_plugin/include/ut0mem.h
      storage/innodb_plugin/lock/lock0lock.c
      storage/innodb_plugin/mem/mem0mem.c
      storage/innodb_plugin/mem/mem0pool.c
      storage/innodb_plugin/os/os0file.c
      storage/innodb_plugin/page/page0zip.c
      storage/innodb_plugin/rem/rem0cmp.c
      storage/innodb_plugin/row/row0ins.c
      storage/innodb_plugin/row/row0merge.c
      storage/innodb_plugin/row/row0mysql.c
      storage/innodb_plugin/row/row0purge.c
      storage/innodb_plugin/row/row0row.c
      storage/innodb_plugin/row/row0sel.c
      storage/innodb_plugin/row/row0uins.c
      storage/innodb_plugin/row/row0umod.c
      storage/innodb_plugin/row/row0undo.c
      storage/innodb_plugin/row/row0upd.c
      storage/innodb_plugin/setup.sh
      storage/innodb_plugin/srv/srv0srv.c
      storage/innodb_plugin/srv/srv0start.c
      storage/innodb_plugin/sync/sync0arr.c
      storage/innodb_plugin/sync/sync0rw.c
      storage/innodb_plugin/trx/trx0i_s.c
      storage/innodb_plugin/trx/trx0trx.c
      storage/innodb_plugin/trx/trx0undo.c
      storage/innodb_plugin/ut/ut0mem.c
      storage/myisam/ft_nlq_search.c
      storage/myisam/fulltext.h
      storage/myisam/mi_dynrec.c
      storage/myisam/mi_locking.c
      storage/myisam/mi_open.c
      storage/myisam/mi_page.c
      storage/myisam/mi_search.c
      storage/myisam/mi_test1.c
      storage/myisam/mi_test2.c
      storage/myisam/mi_unique.c
      storage/myisam/myisam_ftdump.c
      storage/myisam/myisamchk.c
      storage/myisam/myisamlog.c
      storage/myisam/myisampack.c
      storage/myisam/rt_split.c
      storage/myisammrg/ha_myisammrg.cc
      storage/myisammrg/myrg_open.c
      storage/ndb/Makefile.am
      storage/ndb/config/common.mk.am
      storage/ndb/include/kernel/GlobalSignalNumbers.h
      storage/ndb/include/kernel/LogLevel.hpp
      storage/ndb/include/kernel/signaldata/DictTabInfo.hpp
      storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp
      storage/ndb/include/kernel/signaldata/ListTables.hpp
      storage/ndb/include/mgmapi/mgmapi.h
      storage/ndb/include/mgmapi/mgmapi_config_parameters.h
      storage/ndb/include/mgmapi/ndb_logevent.h
      storage/ndb/include/ndbapi/Ndb.hpp
      storage/ndb/include/ndbapi/NdbDictionary.hpp
      storage/ndb/include/ndbapi/NdbOperation.hpp
      storage/ndb/include/transporter/TransporterRegistry.hpp
      storage/ndb/src/common/debugger/EventLogger.cpp
      storage/ndb/src/common/debugger/signaldata/SignalNames.cpp
      storage/ndb/src/common/portlib/NdbMutex.c
      storage/ndb/src/common/transporter/TCP_Transporter.cpp
      storage/ndb/src/common/transporter/TCP_Transporter.hpp
      storage/ndb/src/common/transporter/TransporterRegistry.cpp
      storage/ndb/src/common/util/NdbSqlUtil.cpp
      storage/ndb/src/common/util/SocketServer.cpp
      storage/ndb/src/kernel/blocks/LocalProxy.cpp
      storage/ndb/src/kernel/blocks/LocalProxy.hpp
      storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
      storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp
      storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
      storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
      storage/ndb/src/kernel/blocks/restore.cpp
      storage/ndb/src/kernel/vm/SimulatedBlock.cpp
      storage/ndb/src/kernel/vm/SimulatedBlock.hpp
      storage/ndb/src/kernel/vm/VMSignal.hpp
      storage/ndb/src/kernel/vm/WatchDog.cpp
      storage/ndb/src/mgmapi/mgmapi.cpp
      storage/ndb/src/mgmapi/ndb_logevent.cpp
      storage/ndb/src/mgmclient/CommandInterpreter.cpp
      storage/ndb/src/mgmsrv/ConfigInfo.cpp
      storage/ndb/src/mgmsrv/ConfigInfo.hpp
      storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
      storage/ndb/src/mgmsrv/MgmtSrvr.hpp
      storage/ndb/src/mgmsrv/Services.cpp
      storage/ndb/src/ndbapi/CMakeLists.txt
      storage/ndb/src/ndbapi/ClusterMgr.cpp
      storage/ndb/src/ndbapi/ClusterMgr.hpp
      storage/ndb/src/ndbapi/Makefile.am
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
      storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
      storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
      storage/ndb/src/ndbapi/NdbIndexStat.cpp
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
      storage/ndb/src/ndbapi/NdbScanOperation.cpp
      storage/ndb/src/ndbapi/NdbWaiter.hpp
      storage/ndb/src/ndbapi/Ndbif.cpp
      storage/ndb/src/ndbapi/Ndbinit.cpp
      storage/ndb/src/ndbapi/SignalSender.cpp
      storage/ndb/src/ndbapi/SignalSender.hpp
      storage/ndb/src/ndbapi/TransporterFacade.cpp
      storage/ndb/src/ndbapi/TransporterFacade.hpp
      storage/ndb/src/ndbapi/ndb_cluster_connection.cpp
      storage/ndb/src/ndbapi/trp_client.hpp
      storage/ndb/test/include/NdbSchemaCon.hpp
      storage/ndb/test/include/NdbSchemaOp.hpp
      storage/ndb/test/ndbapi/testIndexStat.cpp
      storage/ndb/test/ndbapi/testNdbApi.cpp
      storage/ndb/test/ndbapi/test_event_merge.cpp
      storage/ndb/test/run-test/daily-basic-tests.txt
      storage/ndb/tools/ndb_test_platform.cpp
      strings/CMakeLists.txt
      strings/Makefile.am
      strings/ctype-big5.c
      strings/ctype-cp932.c
      strings/ctype-euc_kr.c
      strings/ctype-eucjpms.c
      strings/ctype-gb2312.c
      strings/ctype-gbk.c
      strings/ctype-mb.c
      strings/ctype-sjis.c
      strings/ctype-ucs2.c
      strings/ctype-ujis.c
      strings/decimal.c
      strings/make-ccc
      strings/str_test.c
      strings/xml.c
      support-files/compiler_warnings.supp
      support-files/my-innodb-heavy-4G.cnf.sh
      support-files/mysql.spec.sh
      tests/mysql_client_test.c
      unittest/Makefile.am
      unittest/examples/Makefile.am
      unittest/examples/no_plan-t.c
      unittest/mysys/Makefile.am
      unittest/mytap/tap.c
      unittest/mytap/tap.h
      mysql-test/suite/innodb/r/innodb_mysql.result
      mysql-test/suite/rpl/r/rpl_row_find_row.result
      mysql-test/suite/rpl/t/rpl_row_find_row.test
      mysql-test/suite/innodb/t/innodb_mysql.test
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2010-10-15 14:42:00 +0000
+++ b/sql/sql_select.cc	2010-10-15 18:56:29 +0000
@@ -116,17 +116,9 @@ static void reset_nj_counters(List<TABLE
 static uint build_bitmap_for_nested_joins(List<TABLE_LIST> *join_list,
                                           uint first_unused);
 
-/**
- *  SPJ MERGE TODO Bug#48971:
- *  BEWARE: Temp fix for Bug#48971 in SPJ branch affects signature
- *  to optimize_cond.
- *  Permanent fix has not been merged to this branch yet.
- *  Needed as this was a showstopper for further SPJ testing.
- */
 static COND *optimize_cond(JOIN *join, COND *conds,
                            List<TABLE_LIST> *join_list,
-			   Item::cond_result *cond_value,
-                           bool build_equalites);
+			   Item::cond_result *cond_value);
 static bool const_expression_in_where(COND *conds,Item *item, Item **comp_item);
 static bool open_tmp_table(TABLE *table);
 static bool create_myisam_tmp_table(TABLE *table,TMP_TABLE_PARAM *param,
@@ -894,7 +886,7 @@ JOIN::optimize()
       thd->restore_active_arena(arena, &backup);
   }
 
-  conds= optimize_cond(this, conds, join_list, &cond_value, TRUE);   
+  conds= optimize_cond(this, conds, join_list, &cond_value);   
   if (thd->is_error())
   {
     error= 1;
@@ -903,7 +895,7 @@ JOIN::optimize()
   }
 
   {
-    having= optimize_cond(this, having, join_list, &having_value, FALSE);
+    having= optimize_cond(this, having, join_list, &having_value);
     if (thd->is_error())
     {
       error= 1;
@@ -9266,39 +9258,6 @@ static bool check_interleaving_with_nj(J
     function for the first table in join order (for which 
     check_interleaving_with_nj has not been called)
 
-  The algorithm is the reciprocal of check_interleaving_with_nj(), hence
-  parent join nest nodes are updated only when the last table in its child
-  node is removed. The ASCII graphic below will clarify.
-
-  %A table nesting such as <tt> t1 x [ ( t2 x t3 ) x ( t4 x t5 ) ] </tt>is
-  represented by the below join nest tree.
-
-  @verbatim
-                     NJ1
-                  _/ /  \
-                _/  /    NJ2
-              _/   /     / \ 
-             /    /     /   \
-   t1 x [ (t2 x t3) x (t4 x t5) ]
-  @endverbatim
-
-  At the point in time when check_interleaving_with_nj() adds the table t5 to
-  the query execution plan, QEP, it also directs the node named NJ2 to mark
-  the table as covered. NJ2 does so by incrementing its @c counter
-  member. Since all of NJ2's tables are now covered by the QEP, the algorithm
-  proceeds up the tree to NJ1, incrementing its counter as well. All join
-  nests are now completely covered by the QEP.
-
-  restore_prev_nj_state() does the above in reverse. As seen above, the node
-  NJ1 contains the nodes t2, t3, and NJ2. Its counter being equal to 3 means
-  that the plan covers t2, t3, and NJ2, @e and that the sub-plan (t4 x t5)
-  completely covers NJ2. The removal of t5 from the partial plan will first
-  decrement NJ2's counter to 1. It will then detect that NJ2 went from being
-  completely to partially covered, and hence the algorithm must continue
-  upwards to NJ1 and decrement its counter to 2. %A subsequent removal of t4
-  will however not influence NJ1 since it did not un-cover the last table in
-  NJ2.
-
   @param last  join table to remove, it is assumed to be the last in current
                partial join order.
 */
@@ -9325,16 +9284,9 @@ static void restore_prev_nj_state(JOIN_T
 }
 
 
-/**
- *  SPJ MERGE TODO Bug#48971:
- *  BEWARE: Temp fix for Bug#48971 in SPJ branch affects signature
- *  to optimize_cond.
- *  Permanent fix has not been merged to this branch yet.
- *  Needed as this was a showstopper for further SPJ testing.
- */
 static COND *
 optimize_cond(JOIN *join, COND *conds, List<TABLE_LIST> *join_list,
-              Item::cond_result *cond_value, bool build_equalites)
+              Item::cond_result *cond_value)
 {
   THD *thd= join->thd;
   DBUG_ENTER("optimize_cond");
@@ -9352,12 +9304,9 @@ optimize_cond(JOIN *join, COND *conds, L
       multiple equality contains a constant.
     */ 
     DBUG_EXECUTE("where", print_where(conds, "original", QT_ORDINARY););
-    if (build_equalites)
-    {
-      conds= build_equal_items(join->thd, conds, NULL, join_list,
-                               &join->cond_equal);
-      DBUG_EXECUTE("where",print_where(conds,"after equal_items",QT_ORDINARY););
-    }
+    conds= build_equal_items(join->thd, conds, NULL, join_list,
+                             &join->cond_equal);
+    DBUG_EXECUTE("where",print_where(conds,"after equal_items",QT_ORDINARY););
 
     /* change field = field to field = const for each found field = const */
     propagate_cond_constants(thd, (I_List<COND_CMP> *) 0, conds, conds);


Attachment: [text/bzr-bundle] bzr/ole.john.aske@oracle.com-20101015185629-kg0piznbf4mr65ml.bundle
Thread
bzr push into mysql-5.1-telco-7.0-spj branch (ole.john.aske:3223 to 3224) Ole John Aske15 Oct