List:Commits« Previous MessageNext Message »
From:Davi Arnaut Date:January 9 2009 12:02pm
Subject:bzr push into mysql-6.0-bugteam branch (davi:2944 to 2945) Bug#37016
View as plain text  
 2945 Davi Arnaut	2009-01-09 [merge]
      Merge of Bug#37016 to 6.0-bugteam
modified:
  mysql-test/include/commit.inc
  mysql-test/r/commit_1innodb.result
  mysql-test/r/innodb_mysql.result
  mysql-test/t/innodb_mysql.test
  sql/sql_delete.cc

 2944 Sven Sandberg	2009-01-09 [merge]
      merged fix for BUG#41961 in local 5.1-bugteam tree with recent changes in
5.1-bugteam
removed:
  .bzr-mysql.moved/
  .bzr-mysql.moved/default.conf
  .cvsignore
  BUILD/.cvsignore
  BitKeeper/
  BitKeeper/etc/
  BitKeeper/etc/RESYNC_TREE
  BitKeeper/etc/collapsed
  BitKeeper/etc/config
  BitKeeper/etc/gone
  BitKeeper/etc/logging_ok
  BitKeeper/etc/notify
  BitKeeper/etc/skipkeys
  BitKeeper/post-outgoing
  BitKeeper/triggers/
  BitKeeper/triggers/post-commit
  BitKeeper/triggers/post-commit.innodb.pl
  BitKeeper/triggers/post-incoming.innodb.pl
  BitKeeper/triggers/pre-commit
  BitKeeper/triggers/pre-commit.check-case.pl
  BitKeeper/triggers/pre-commit.innodb.pl
  BitKeeper/triggers/pre-delta
  BitKeeper/triggers/pre-outgoing.crash-protect.pl
  BitKeeper/triggers/pre-resolve.crash-protect.pl
  BitKeeper/triggers/triggers-lib.pl
  Docs/.cvsignore
  client/.cvsignore
  cmd-line-utils/readline/.cvsignore
  extra/.cvsignore
  include/.cvsignore
  libmysql/.cvsignore
  man/.cvsignore
  mysql-test/include/wait_until_disconnected.inc
  mysql-test/r/rpl_slave_exec_mode_basic.result
  mysql-test/suite/rpl_ndb_big/r/rpl_ndb_log.result
  mysql-test/suite/rpl_ndb_big/t/rpl_ndb_log-master.opt
  mysql-test/suite/rpl_ndb_big/t/rpl_ndb_log.test
  mysys/.cvsignore
  regex/.cvsignore
  scripts/.cvsignore
  sql/.cvsignore
  sql/share/.cvsignore
  storage/heap/.cvsignore
  storage/myisam/.cvsignore
  storage/myisammrg/.cvsignore
  strings/.cvsignore
  strings/ChangeLog
  strings/bcopy-duff.c
  strings/bzero.c
  strings/macros.asm
  strings/memcmp.c
  strings/memcpy.c
  strings/memset.c
  strings/ptr_cmp.asm
  strings/strcat.c
  strings/strchr.c
  strings/strcmp.c
  strings/strings.asm
  strings/strlen.c
  strings/strrchr.c
  strings/strxmov.asm
  strings/udiv.c
  support-files/.cvsignore
  tests/.cvsignore
  vio/.cvsignore
added:
  config/ac-macros/libmemcached.m4
  config/ac-macros/search_for_lib.m4
  mysql-test/extra/rpl_tests/rpl_row_basic_no_pk.test
  mysql-test/include/UnicodeData.txt
  mysql-test/include/mysqladmin_shutdown.inc
  mysql-test/include/show_qc_status.inc
  mysql-test/include/wait_until_disconnected.inc
  mysql-test/include/world.inc
  mysql-test/include/world_schema.inc
  mysql-test/include/world_schema1.inc
  mysql-test/r/join_cache.result
  mysql-test/r/join_nested_jcl6.result
  mysql-test/r/join_outer_jcl6.result
  mysql-test/r/maria_mrr.result
  mysql-test/r/rpl_slave_allow_batching_basic.result
  mysql-test/r/rpl_slave_compressed_protocol_basic.result
  mysql-test/r/rpl_slave_exec_mode_basic.result
  mysql-test/r/rpl_slave_net_timeout_basic.result
  mysql-test/r/select_jcl6.result
  mysql-test/r/subselect3_jcl6.result
  mysql-test/r/subselect_sj2_jcl6.result
  mysql-test/r/subselect_sj_jcl6.result
  mysql-test/std_data/ndb_apply_status.frm
  mysql-test/suite/backup_engines/r/backup_partition.result
  mysql-test/suite/backup_engines/t/backup_partition.test
  mysql-test/suite/falcon/r/falcon_bug_29246.result
  mysql-test/suite/falcon/r/falcon_bug_34351_A-big.result
  mysql-test/suite/falcon/r/falcon_bug_34351_C-big.result
  mysql-test/suite/falcon/r/falcon_bug_39702.result
  mysql-test/suite/falcon/r/falcon_bug_40614.result
  mysql-test/suite/falcon/r/falcon_bug_40994.result
  mysql-test/suite/falcon/r/falcon_information_schema.result
  mysql-test/suite/falcon/r/falcon_unicode-big.result
  mysql-test/suite/falcon/t/falcon_bug_29246.test
  mysql-test/suite/falcon/t/falcon_bug_34351_A-big.test
  mysql-test/suite/falcon/t/falcon_bug_34351_C-big.test
  mysql-test/suite/falcon/t/falcon_bug_39702.test
  mysql-test/suite/falcon/t/falcon_bug_40614.test
  mysql-test/suite/falcon/t/falcon_bug_40994.test
  mysql-test/suite/falcon/t/falcon_information_schema.test
  mysql-test/suite/falcon/t/falcon_unicode-big.test
  mysql-test/suite/maria/r/maria-recovery3.result
  mysql-test/suite/maria/r/maria_showlog_error.result
  mysql-test/suite/maria/t/maria-recovery3-master.opt
  mysql-test/suite/maria/t/maria-recovery3.test
  mysql-test/suite/maria/t/maria_showlog_error.test
  mysql-test/suite/ndb/r/bug36547.result
  mysql-test/suite/ndb/r/ndb_cache_trans.result
  mysql-test/suite/ndb/r/ndb_dbug_lock.result
  mysql-test/suite/ndb/r/ndb_discover_db.result
  mysql-test/suite/ndb/r/ndb_discover_db2.result
  mysql-test/suite/ndb/t/bug36547.test
  mysql-test/suite/ndb/t/ndb_cache_trans.test
  mysql-test/suite/ndb/t/ndb_dbug_lock.test
  mysql-test/suite/ndb/t/ndb_discover_db.test
  mysql-test/suite/ndb/t/ndb_discover_db2-master.opt
  mysql-test/suite/ndb/t/ndb_discover_db2.test
  mysql-test/suite/ndb_binlog/
  mysql-test/suite/ndb_binlog/r/
  mysql-test/suite/ndb_binlog/r/ndb_binlog_restore.result
  mysql-test/suite/ndb_binlog/t/
  mysql-test/suite/ndb_binlog/t/ndb_binlog_restore-master.opt
  mysql-test/suite/ndb_binlog/t/ndb_binlog_restore.test
  mysql-test/suite/parts/r/partition_alter2_1_maria.result
  mysql-test/suite/parts/r/partition_alter2_2_maria.result
  mysql-test/suite/parts/r/partition_auto_increment_maria.result
  mysql-test/suite/parts/t/partition_alter2_1_maria.test
  mysql-test/suite/parts/t/partition_alter2_2_maria.test
  mysql-test/suite/parts/t/partition_auto_increment_maria.test
  mysql-test/suite/rpl/r/rpl_extraCol_falcon.result
  mysql-test/suite/rpl/r/rpl_extraColmaster_falcon.result
  mysql-test/suite/rpl/r/rpl_locktrans_falcon.result
  mysql-test/suite/rpl/r/rpl_relay_space_falcon.result
  mysql-test/suite/rpl/r/rpl_row_blob_falcon.result
  mysql-test/suite/rpl/r/rpl_truncate_falcon.result
  mysql-test/suite/rpl/t/rpl_extraCol_falcon.test
  mysql-test/suite/rpl/t/rpl_extraColmaster_falcon.test
  mysql-test/suite/rpl/t/rpl_locktrans_falcon.test
  mysql-test/suite/rpl/t/rpl_relay_space_falcon.test
  mysql-test/suite/rpl/t/rpl_row_blob_falcon.test
  mysql-test/suite/rpl/t/rpl_truncate_falcon.test
  mysql-test/suite/rpl_ndb/r/rpl_ndb_bug22045.result
  mysql-test/suite/rpl_ndb/t/rpl_ndb_bug22045.test
  mysql-test/t/join_cache.test
  mysql-test/t/join_nested_jcl6.test
  mysql-test/t/join_outer_jcl6.test
  mysql-test/t/maria_mrr.test
  mysql-test/t/rpl_slave_allow_batching_basic.test
  mysql-test/t/rpl_slave_compressed_protocol_basic.test
  mysql-test/t/rpl_slave_net_timeout_basic.test
  mysql-test/t/select_jcl6.test
  mysql-test/t/subselect3_jcl6.test
  mysql-test/t/subselect_sj2_jcl6.test
  mysql-test/t/subselect_sj_jcl6.test
  mysys/tests/
  mysys/tests/Makefile.am
  mysys/tests/test_thr_mutex.c
  sql/backup/debug.h
  sql/ha_ndbcluster_lock_ext.h
  sql/sql_join_cache.cc
  sql/sql_prepare.h
  storage/falcon/CompareAndSwapSparc.h
  storage/ndb/include/util/NdbTap.hpp
  storage/ndb/ndbapi-examples/ndbapi_recattr_vs_record/
  storage/ndb/ndbapi-examples/ndbapi_recattr_vs_record/Makefile
  storage/ndb/ndbapi-examples/ndbapi_recattr_vs_record/main.cpp
  storage/ndb/src/common/util/ndb_show_compat.cpp
  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
  storage/ndb/test/include/SqlClient.hpp
  storage/ndb/test/ndbapi/testUpgrade.cpp
  storage/ndb/test/run-test/atrt-backtrace.sh
  storage/ndb/test/run-test/command.cpp
  storage/ndb/test/run-test/db.cpp
  storage/ndb/test/run-test/db.sql
  storage/ndb/test/src/SqlClient.cpp
renamed:
  mysql-test/r/rpl_slave_allow_batching_basic.result =>
mysql-test/r/slave_allow_batching_basic.result
  mysql-test/r/rpl_slave_compressed_protocol_basic.result =>
mysql-test/r/slave_compressed_protocol_basic.result
  mysql-test/r/rpl_slave_net_timeout_basic.result =>
mysql-test/r/slave_net_timeout_basic.result
  mysql-test/suite/funcs_1/r/is_collation_charset_applic.result =>
mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result
  mysql-test/suite/funcs_1/t/is_collation_charset_applic.test =>
mysql-test/suite/funcs_1/t/is_collation_character_set_applicability.test
  mysql-test/suite/ndb/r/ndb_binlog_basic.result =>
mysql-test/suite/ndb_binlog/r/ndb_binlog_basic.result
  mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result =>
mysql-test/suite/ndb_binlog/r/ndb_binlog_ddl_multi.result
  mysql-test/suite/ndb/r/ndb_binlog_discover.result =>
mysql-test/suite/ndb_binlog/r/ndb_binlog_discover.result
  mysql-test/suite/ndb/r/ndb_binlog_ignore_db.result =>
mysql-test/suite/ndb_binlog/r/ndb_binlog_ignore_db.result
  mysql-test/suite/ndb/r/ndb_binlog_log_bin.result =>
mysql-test/suite/ndb_binlog/r/ndb_binlog_log_bin.result
  mysql-test/suite/ndb/r/ndb_binlog_multi.result =>
mysql-test/suite/ndb_binlog/r/ndb_binlog_multi.result
  mysql-test/suite/ndb/t/ndb_binlog_basic.test =>
mysql-test/suite/ndb_binlog/t/ndb_binlog_basic.test
  mysql-test/suite/ndb/t/ndb_binlog_ddl_multi.test =>
mysql-test/suite/ndb_binlog/t/ndb_binlog_ddl_multi.test
  mysql-test/suite/ndb/t/ndb_binlog_discover.test =>
mysql-test/suite/ndb_binlog/t/ndb_binlog_discover.test
  mysql-test/suite/ndb/t/ndb_binlog_ignore_db-master.opt =>
mysql-test/suite/ndb_binlog/t/ndb_binlog_ignore_db-master.opt
  mysql-test/suite/ndb/t/ndb_binlog_ignore_db.test =>
mysql-test/suite/ndb_binlog/t/ndb_binlog_ignore_db.test
  mysql-test/suite/ndb/t/ndb_binlog_log_bin.test =>
mysql-test/suite/ndb_binlog/t/ndb_binlog_log_bin.test
  mysql-test/suite/ndb/t/ndb_binlog_multi.test =>
mysql-test/suite/ndb_binlog/t/ndb_binlog_multi.test
  mysql-test/suite/ndb_team/r/ndb_binlog_format.result =>
mysql-test/suite/ndb_binlog/r/ndb_binlog_format.result
  mysql-test/suite/ndb_team/r/ndb_dd_restore_compat.result =>
mysql-test/suite/ndb/r/ndb_dd_restore_compat.result
  mysql-test/suite/ndb_team/t/ndb_binlog_format.test =>
mysql-test/suite/ndb_binlog/t/ndb_binlog_format.test
  mysql-test/suite/ndb_team/t/ndb_dd_restore_compat.test =>
mysql-test/suite/ndb/t/ndb_dd_restore_compat.test
  mysql-test/suite/rpl_ndb_big/r/rpl_ndb_add_column.result =>
mysql-test/suite/rpl_ndb/r/rpl_ndb_add_column.result
  mysql-test/suite/rpl_ndb_big/t/rpl_ndb_add_column.test =>
mysql-test/suite/rpl_ndb/t/rpl_ndb_add_column.test
  mysql-test/t/rpl_slave_allow_batching_basic.test =>
mysql-test/t/slave_allow_batching_basic.test
  mysql-test/t/rpl_slave_compressed_protocol_basic.test =>
mysql-test/t/slave_compressed_protocol_basic.test
  mysql-test/t/rpl_slave_net_timeout_basic.test =>
mysql-test/t/slave_net_timeout_basic.test
  mysys/test_charset.c => mysys/tests/test_charset.c
  mysys/test_dir.c => mysys/tests/test_dir.c
  mysys/testhash.c => mysys/tests/testhash.c
  storage/ndb/src/common/util/ndb_init.c => storage/ndb/src/common/util/ndb_init.cpp
modified:
  .bzrignore
  BUILD/SETUP.sh
  BUILD/autorun.sh
  BUILD/compile-dist
  BUILD/compile-pentium-gcov
  BUILD/compile-solaris-amd64
  CMakeLists.txt
  Makefile.am
  client/CMakeLists.txt
  client/Makefile.am
  client/mysql.cc
  client/mysqladmin.cc
  client/mysqldump.c
  client/mysqlimport.c
  client/mysqlshow.c
  client/mysqlslap.c
  client/mysqltest.c
  cluster_change_hist.txt
  config/ac-macros/ha_ndbcluster.m4
  config/ac-macros/misc.m4
  config/ac-macros/zlib.m4
  configure.in
  dbug/CMakeLists.txt
  dbug/Makefile.am
  dbug/dbug.c
  extra/CMakeLists.txt
  extra/Makefile.am
  include/config-win.h
  include/hash.h
  include/m_string.h
  include/my_base.h
  include/my_pthread.h
  include/my_sys.h
  include/mysql.h.pp
  include/mysql_com.h
  include/thr_lock.h
  include/waiting_threads.h
  libmysql/CMakeLists.txt
  libmysql/Makefile.am
  libmysql/Makefile.shared
  libmysql/libmysql.c
  libmysqld/CMakeLists.txt
  libmysqld/Makefile.am
  libmysqld/emb_qcache.cc
  libmysqld/examples/CMakeLists.txt
  libmysqld/examples/Makefile.am
  libmysqld/examples/test-run
  libmysqld/lib_sql.cc
  mysql-test/create-test-result
  mysql-test/extra/rpl_tests/rpl_row_basic.test
  mysql-test/extra/rpl_tests/rpl_truncate_helper.test
  mysql-test/include/have_32bit.inc
  mysql-test/include/have_64bit.inc
  mysql-test/include/have_blackhole.inc
  mysql-test/include/maria_empty_logs.inc
  mysql-test/include/restart_mysqld.inc
  mysql-test/include/wait_until_connected_again.inc
  mysql-test/lib/mtr_cases.pl
  mysql-test/lib/mtr_report.pl
  mysql-test/mysql-test-run.pl
  mysql-test/r/auto_commit_basic.result
  mysql-test/r/automatic_sp_privileges_basic.result
  mysql-test/r/big_tables_basic.result
  mysql-test/r/compress.result
  mysql-test/r/engine_condition_pushdown_basic.result
  mysql-test/r/events_bugs.result
  mysql-test/r/flush_basic.result
  mysql-test/r/foreign_key_checks_basic.result
  mysql-test/r/fulltext.result
  mysql-test/r/func_math.result
  mysql-test/r/func_str.result
  mysql-test/r/func_time.result
  mysql-test/r/general_log_basic.result
  mysql-test/r/group_by.result
  mysql-test/r/index_merge_myisam.result
  mysql-test/r/innodb_checksums_basic.result
  mysql-test/r/innodb_doublewrite_basic.result
  mysql-test/r/innodb_file_per_table_basic.result
  mysql-test/r/innodb_locks_unsafe_for_binlog_basic.result
  mysql-test/r/innodb_mysql.result
  mysql-test/r/innodb_rollback_on_timeout_basic.result
  mysql-test/r/innodb_support_xa_basic.result
  mysql-test/r/innodb_table_locks_basic.result
  mysql-test/r/join_nested.result
  mysql-test/r/join_outer.result
  mysql-test/r/keep_files_on_create_basic.result
  mysql-test/r/local_infile_basic.result
  mysql-test/r/log_bin_trust_function_creators_basic.result
  mysql-test/r/log_queries_not_using_indexes_basic.result
  mysql-test/r/low_priority_updates_basic.result
  mysql-test/r/myisam_mrr.result
  mysql-test/r/myisam_use_mmap_basic.result
  mysql-test/r/named_pipe.result
  mysql-test/r/new_basic.result
  mysql-test/r/old_passwords_basic.result
  mysql-test/r/order_by.result
  mysql-test/r/partition_pruning.result
  mysql-test/r/pool_of_threads.result
  mysql-test/r/profiling.result
  mysql-test/r/ps_1general.result
  mysql-test/r/query_cache.result
  mysql-test/r/query_cache_wlock_invalidate_basic.result
  mysql-test/r/read_only_basic.result
  mysql-test/r/relay_log_purge_basic.result
  mysql-test/r/secure_auth_basic.result
  mysql-test/r/select.result
  mysql-test/r/shm.result
  mysql-test/r/slow_query_log_basic.result
  mysql-test/r/sp-error.result
  mysql-test/r/sp-vars.result
  mysql-test/r/sql_auto_is_null_basic.result
  mysql-test/r/sql_big_selects_basic.result
  mysql-test/r/sql_big_tables_basic.result
  mysql-test/r/sql_buffer_result_basic.result
  mysql-test/r/sql_log_bin_basic.result
  mysql-test/r/sql_log_off_basic.result
  mysql-test/r/sql_low_priority_updates_basic.result
  mysql-test/r/sql_notes_basic.result
  mysql-test/r/sql_quote_show_create_basic.result
  mysql-test/r/sql_safe_updates_basic.result
  mysql-test/r/sql_warnings_basic.result
  mysql-test/r/ssl.result
  mysql-test/r/ssl_compress.result
  mysql-test/r/subselect.result
  mysql-test/r/subselect2.result
  mysql-test/r/subselect3.result
  mysql-test/r/subselect_mat.result
  mysql-test/r/subselect_no_mat.result
  mysql-test/r/subselect_no_opts.result
  mysql-test/r/subselect_no_semijoin.result
  mysql-test/r/subselect_sj.result
  mysql-test/r/subselect_sj2.result
  mysql-test/r/sync_frm_basic.result
  mysql-test/r/temp_table.result
  mysql-test/r/timed_mutexes_basic.result
  mysql-test/r/type_varchar.result
  mysql-test/r/unique_checks_basic.result
  mysql-test/r/view.result
  mysql-test/suite/backup/r/backup.result
  mysql-test/suite/backup/r/backup_backupdir.result
  mysql-test/suite/backup/r/backup_db_grants.result
  mysql-test/suite/backup/r/backup_default.result
  mysql-test/suite/backup/r/backup_errors.result
  mysql-test/suite/backup/r/backup_lock_myisam.result
  mysql-test/suite/backup/r/backup_views.result
  mysql-test/suite/backup/t/backup.test
  mysql-test/suite/backup/t/backup_backupdir.test
  mysql-test/suite/backup/t/backup_db_grants.test
  mysql-test/suite/backup/t/backup_default.test
  mysql-test/suite/backup/t/backup_errors.test
  mysql-test/suite/backup/t/backup_myisam1.test
  mysql-test/suite/backup/t/backup_views.test
  mysql-test/suite/backup/t/disabled.def
  mysql-test/suite/binlog/r/binlog_multi_engine.result
  mysql-test/suite/binlog/t/disabled.def
  mysql-test/suite/falcon/r/falcon_bug_22089.result
  mysql-test/suite/falcon/r/falcon_bug_22181.result
  mysql-test/suite/falcon/r/falcon_bug_28049.result
  mysql-test/suite/falcon/r/falcon_bug_34351_A.result
  mysql-test/suite/falcon/r/falcon_bug_34351_C.result
  mysql-test/suite/falcon/r/falcon_bug_39708.result
  mysql-test/suite/falcon/r/falcon_bugs.result
  mysql-test/suite/falcon/r/falcon_online_index.result
  mysql-test/suite/falcon/r/falcon_options.result
  mysql-test/suite/falcon/r/falcon_options2.result
  mysql-test/suite/falcon/r/falcon_select.result
  mysql-test/suite/falcon/r/index_merge_falcon.result
  mysql-test/suite/falcon/t/disabled.def
  mysql-test/suite/falcon/t/falcon_bug_22089.test
  mysql-test/suite/falcon/t/falcon_bug_22181.test
  mysql-test/suite/falcon/t/falcon_bug_28095.test
  mysql-test/suite/falcon/t/falcon_bug_34351_A.test
  mysql-test/suite/falcon/t/falcon_bug_34351_C.test
  mysql-test/suite/falcon/t/falcon_bug_39708-master.opt
  mysql-test/suite/falcon/t/falcon_bug_39708.test
  mysql-test/suite/falcon/t/falcon_bugs.test
  mysql-test/suite/falcon/t/falcon_options.test
  mysql-test/suite/falcon/t/falcon_options2.test
  mysql-test/suite/funcs_1/r/falcon_func_view.result
  mysql-test/suite/funcs_1/r/falcon_views.result
  mysql-test/suite/funcs_1/r/innodb_func_view.result
  mysql-test/suite/funcs_1/r/innodb_views.result
  mysql-test/suite/funcs_1/r/memory_func_view.result
  mysql-test/suite/funcs_1/r/memory_views.result
  mysql-test/suite/funcs_1/r/myisam_func_view.result
  mysql-test/suite/funcs_1/r/myisam_views.result
  mysql-test/suite/funcs_1/r/ndb_func_view.result
  mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result
  mysql-test/suite/funcs_1/r/ndb_views.result
  mysql-test/suite/funcs_1/r/storedproc.result
  mysql-test/suite/funcs_1/t/disabled.def
  mysql-test/suite/funcs_2/t/disabled.def
  mysql-test/suite/maria/r/maria-big.result
  mysql-test/suite/maria/r/maria-preload.result
  mysql-test/suite/maria/r/maria-recovery-big.result
  mysql-test/suite/maria/r/maria.result
  mysql-test/suite/maria/r/maria3.result
  mysql-test/suite/maria/r/maria_notembedded.result
  mysql-test/suite/maria/t/maria-big.test
  mysql-test/suite/maria/t/maria-lock.test
  mysql-test/suite/maria/t/maria-recovery-big-master.opt
  mysql-test/suite/maria/t/maria-recovery-big.test
  mysql-test/suite/maria/t/maria.test
  mysql-test/suite/maria/t/maria3.test
  mysql-test/suite/maria/t/maria_notembedded.test
  mysql-test/suite/ndb/r/ndb_alter_table.result
  mysql-test/suite/ndb/r/ndb_alter_table3.result
  mysql-test/suite/ndb/r/ndb_alter_table_backup.result
  mysql-test/suite/ndb/r/ndb_alter_table_online.result
  mysql-test/suite/ndb/r/ndb_alter_table_online2.result
  mysql-test/suite/ndb/r/ndb_basic.result
  mysql-test/suite/ndb/r/ndb_blob.result
  mysql-test/suite/ndb/r/ndb_cache.result
  mysql-test/suite/ndb/r/ndb_condition_pushdown.result
  mysql-test/suite/ndb/r/ndb_dd_ddl.result
  mysql-test/suite/ndb/r/ndb_insert.result
  mysql-test/suite/ndb/r/ndb_multi_row.result
  mysql-test/suite/ndb/r/ndb_partition_range.result
  mysql-test/suite/ndb/r/ndb_read_multi_range.result
  mysql-test/suite/ndb/r/ndb_replace.result
  mysql-test/suite/ndb/r/ndb_restore.result
  mysql-test/suite/ndb/r/ndb_restore_compat.result
  mysql-test/suite/ndb/r/ndb_restore_different_endian_data.result
  mysql-test/suite/ndb/r/ndb_single_user.result
  mysql-test/suite/ndb/r/ndb_trigger.result
  mysql-test/suite/ndb/t/disabled.def
  mysql-test/suite/ndb/t/ndb_alter_table.test
  mysql-test/suite/ndb/t/ndb_alter_table3.test
  mysql-test/suite/ndb/t/ndb_alter_table_backup.test
  mysql-test/suite/ndb/t/ndb_alter_table_online.test
  mysql-test/suite/ndb/t/ndb_alter_table_online2.test
  mysql-test/suite/ndb/t/ndb_basic.test
  mysql-test/suite/ndb/t/ndb_blob.test
  mysql-test/suite/ndb/t/ndb_cache.test
  mysql-test/suite/ndb/t/ndb_cache2.test
  mysql-test/suite/ndb/t/ndb_condition_pushdown.test
  mysql-test/suite/ndb/t/ndb_dd_ddl.test
  mysql-test/suite/ndb/t/ndb_dd_dump.test
  mysql-test/suite/ndb/t/ndb_insert.test
  mysql-test/suite/ndb/t/ndb_partition_range.test
  mysql-test/suite/ndb/t/ndb_read_multi_range.test
  mysql-test/suite/ndb/t/ndb_replace.test
  mysql-test/suite/ndb/t/ndb_restore.test
  mysql-test/suite/ndb/t/ndb_restore_compat.test
  mysql-test/suite/ndb/t/ndb_restore_different_endian_data.test
  mysql-test/suite/ndb/t/ndb_single_user.test
  mysql-test/suite/ndb/t/ndb_trigger.test
  mysql-test/suite/ndb_team/r/ndb_autodiscover3.result
  mysql-test/suite/ndb_team/t/ndb_autodiscover3.test
  mysql-test/suite/ndb_team/t/rpl_ndb_dd_advance.test
  mysql-test/suite/parts/r/partition_engine_ndb.result
  mysql-test/suite/rpl/r/rpl_locktrans_innodb.result
  mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result
  mysql-test/suite/rpl/r/rpl_truncate_2myisam.result
  mysql-test/suite/rpl/r/rpl_truncate_3innodb.result
  mysql-test/suite/rpl/t/disabled.def
  mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test
  mysql-test/suite/rpl/t/rpl_row_basic_2myisam.test
  mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test
  mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test
  mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result
  mysql-test/suite/rpl_ndb/t/disabled.def
  mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test
  mysql-test/suite/rpl_ndb_big/r/rpl_ndb_apply_status.result
  mysql-test/suite/rpl_ndb_big/r/rpl_row_basic_7ndb.result
  mysql-test/suite/rpl_ndb_big/t/disabled.def
  mysql-test/suite/rpl_ndb_big/t/rpl_ndb_apply_status.test
  mysql-test/suite/rpl_ndb_big/t/rpl_row_basic_7ndb.test
  mysql-test/suite/sys_vars/inc/sort_buffer_size_basic.inc
  mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result
  mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result
  mysql-test/suite/sys_vars/t/disabled.def
  mysql-test/t/auto_commit_basic.test
  mysql-test/t/automatic_sp_privileges_basic.test
  mysql-test/t/big_tables_basic.test
  mysql-test/t/disabled.def
  mysql-test/t/engine_condition_pushdown_basic.test
  mysql-test/t/events_bugs.test
  mysql-test/t/events_logs_tests-master.opt
  mysql-test/t/flush_basic.test
  mysql-test/t/foreign_key_checks_basic.test
  mysql-test/t/fulltext.test
  mysql-test/t/func_math.test
  mysql-test/t/func_time.test
  mysql-test/t/general_log_basic.test
  mysql-test/t/innodb_checksums_basic.test
  mysql-test/t/innodb_doublewrite_basic.test
  mysql-test/t/innodb_file_per_table_basic.test
  mysql-test/t/innodb_locks_unsafe_for_binlog_basic.test
  mysql-test/t/innodb_mysql.test
  mysql-test/t/innodb_rollback_on_timeout_basic.test
  mysql-test/t/innodb_support_xa_basic.test
  mysql-test/t/innodb_table_locks_basic.test
  mysql-test/t/keep_files_on_create_basic.test
  mysql-test/t/local_infile_basic.test
  mysql-test/t/log_bin_trust_function_creators_basic.test
  mysql-test/t/log_queries_not_using_indexes_basic.test
  mysql-test/t/log_tables-big-master.opt
  mysql-test/t/log_tables-master.opt
  mysql-test/t/low_priority_updates_basic.test
  mysql-test/t/multi_statement-master.opt
  mysql-test/t/myisam_use_mmap_basic.test
  mysql-test/t/new_basic.test
  mysql-test/t/old_passwords_basic.test
  mysql-test/t/partition_pruning.test
  mysql-test/t/ps-master.opt
  mysql-test/t/query_cache_wlock_invalidate_basic.test
  mysql-test/t/read_only_basic.test
  mysql-test/t/relay_log_purge_basic.test
  mysql-test/t/secure_auth_basic.test
  mysql-test/t/show_check-master.opt
  mysql-test/t/slow_query_log_basic.test
  mysql-test/t/slow_query_log_file_basic-master.opt
  mysql-test/t/slow_query_log_file_func-master.opt
  mysql-test/t/sp-error.test
  mysql-test/t/sp-vars.test
  mysql-test/t/sql_auto_is_null_basic.test
  mysql-test/t/sql_big_selects_basic.test
  mysql-test/t/sql_big_tables_basic.test
  mysql-test/t/sql_buffer_result_basic.test
  mysql-test/t/sql_log_bin_basic.test
  mysql-test/t/sql_log_off_basic.test
  mysql-test/t/sql_low_priority_updates_basic.test
  mysql-test/t/sql_notes_basic.test
  mysql-test/t/sql_quote_show_create_basic.test
  mysql-test/t/sql_safe_updates_basic.test
  mysql-test/t/sql_warnings_basic.test
  mysql-test/t/status.test
  mysql-test/t/subselect.test
  mysql-test/t/subselect3.test
  mysql-test/t/subselect_mat.test
  mysql-test/t/sync_frm_basic.test
  mysql-test/t/temp_table.test
  mysql-test/t/timed_mutexes_basic.test
  mysql-test/t/type_varchar.test
  mysql-test/t/union-master.opt
  mysql-test/t/unique_checks_basic.test
  mysys/CMakeLists.txt
  mysys/Makefile.am
  mysys/hash.c
  mysys/lf_hash.c
  mysys/my_bitmap.c
  mysys/my_getopt.c
  mysys/my_init.c
  mysys/my_pthread.c
  mysys/my_sleep.c
  mysys/my_thr_init.c
  mysys/my_wincond.c
  mysys/my_winthread.c
  mysys/mysys_priv.h
  mysys/queues.c
  mysys/stacktrace.c
  mysys/thr_mutex.c
  mysys/waiting_threads.c
  netware/BUILD/nwbootstrap
  netware/Makefile.am
  regex/CMakeLists.txt
  regex/Makefile.am
  scripts/CMakeLists.txt
  scripts/Makefile.am
  scripts/make_win_bin_dist
  sql/CMakeLists.txt
  sql/Makefile.am
  sql/backup/CMakeLists.txt
  sql/backup/backup_aux.h
  sql/backup/backup_info.cc
  sql/backup/backup_info.h
  sql/backup/backup_kernel.h
  sql/backup/backup_test.cc
  sql/backup/be_thread.cc
  sql/backup/data_backup.cc
  sql/backup/image_info.cc
  sql/backup/image_info.h
  sql/backup/kernel.cc
  sql/backup/logger.cc
  sql/backup/logger.h
  sql/backup/restore_info.h
  sql/backup/stream.cc
  sql/backup/stream.h
  sql/debug_sync.cc
  sql/event_data_objects.cc
  sql/event_db_repository.cc
  sql/event_parse_data.cc
  sql/event_parse_data.h
  sql/event_queue.cc
  sql/event_scheduler.cc
  sql/events.cc
  sql/field.cc
  sql/field.h
  sql/gen_lex_hash.cc
  sql/ha_ndbcluster.cc
  sql/ha_ndbcluster.h
  sql/ha_ndbcluster_binlog.cc
  sql/ha_ndbcluster_binlog.h
  sql/ha_ndbcluster_cond.cc
  sql/ha_ndbcluster_cond.h
  sql/ha_ndbcluster_connection.cc
  sql/ha_ndbcluster_connection.h
  sql/ha_partition.cc
  sql/ha_partition.h
  sql/handler.cc
  sql/handler.h
  sql/item.cc
  sql/item.h
  sql/item_cmpfunc.h
  sql/item_create.cc
  sql/item_func.cc
  sql/item_func.h
  sql/item_subselect.cc
  sql/item_subselect.h
  sql/item_timefunc.cc
  sql/lock.cc
  sql/log.cc
  sql/log_event.cc
  sql/log_event_old.cc
  sql/mysql_priv.h
  sql/mysql_priv.h.pp
  sql/mysqld.cc
  sql/opt_range.cc
  sql/opt_range.h
  sql/partition_info.h
  sql/protocol.cc
  sql/protocol.h
  sql/records.h
  sql/rpl_injector.cc
  sql/rpl_injector.h
  sql/rpl_mi.cc
  sql/rpl_rli.cc
  sql/set_var.cc
  sql/share/errmsg.txt
  sql/si_logs.h
  sql/si_objects.cc
  sql/si_objects.h
  sql/slave.cc
  sql/sp.cc
  sql/sp_cache.cc
  sql/sp_cache.h
  sql/sp_head.cc
  sql/sp_rcontext.cc
  sql/sp_rcontext.h
  sql/sql_acl.cc
  sql/sql_audit.cc
  sql/sql_base.cc
  sql/sql_cache.cc
  sql/sql_class.cc
  sql/sql_class.h
  sql/sql_connect.cc
  sql/sql_db.cc
  sql/sql_delete.cc
  sql/sql_derived.cc
  sql/sql_error.cc
  sql/sql_error.h
  sql/sql_insert.cc
  sql/sql_lex.cc
  sql/sql_lex.h
  sql/sql_list.cc
  sql/sql_list.h
  sql/sql_load.cc
  sql/sql_parse.cc
  sql/sql_partition.cc
  sql/sql_plugin.cc
  sql/sql_prepare.cc
  sql/sql_rename.cc
  sql/sql_repl.cc
  sql/sql_select.cc
  sql/sql_select.h
  sql/sql_servers.cc
  sql/sql_show.cc
  sql/sql_show.h
  sql/sql_string.h
  sql/sql_table.cc
  sql/sql_test.cc
  sql/sql_udf.cc
  sql/sql_union.cc
  sql/sql_update.cc
  sql/sql_yacc.yy
  sql/table.cc
  sql/table.h
  sql/thr_malloc.cc
  sql/time.cc
  sql/transaction.cc
  sql/tztime.cc
  sql/udf_example.c
  sql/unireg.cc
  storage/archive/Makefile.am
  storage/archive/archive_reader.c
  storage/archive/support/archive_read_test.slap
  storage/blackhole/CMakeLists.txt
  storage/blackhole/ha_blackhole.cc
  storage/blackhole/ha_blackhole.h
  storage/csv/CMakeLists.txt
  storage/example/CMakeLists.txt
  storage/falcon/CompareAndSwapSparc.il
  storage/falcon/Configuration.cpp
  storage/falcon/DataPage.cpp
  storage/falcon/Database.cpp
  storage/falcon/IO.cpp
  storage/falcon/Index.cpp
  storage/falcon/IndexRootPage.cpp
  storage/falcon/IndexWalker.cpp
  storage/falcon/Interlock.h
  storage/falcon/Log.h
  storage/falcon/Makefile.am
  storage/falcon/MySQLCollation.cpp
  storage/falcon/PageInventoryPage.cpp
  storage/falcon/SRLBlobDelete.h
  storage/falcon/SRLBlobUpdate.h
  storage/falcon/SRLCreateIndex.h
  storage/falcon/SRLCreateSection.h
  storage/falcon/SRLCreateTableSpace.cpp
  storage/falcon/SRLCreateTableSpace.h
  storage/falcon/SRLData.h
  storage/falcon/SRLDelete.h
  storage/falcon/SRLDeleteIndex.cpp
  storage/falcon/SRLDeleteIndex.h
  storage/falcon/SRLDropTableSpace.cpp
  storage/falcon/SRLDropTableSpace.h
  storage/falcon/SRLFreePage.h
  storage/falcon/SRLIndexAdd.h
  storage/falcon/SRLIndexDelete.h
  storage/falcon/SRLIndexPage.h
  storage/falcon/SRLInversionPage.h
  storage/falcon/SRLOverflowPages.h
  storage/falcon/SRLRecordLocator.h
  storage/falcon/SRLRecordStub.h
  storage/falcon/SRLSectionLine.h
  storage/falcon/SRLSectionPage.h
  storage/falcon/SRLSectionPromotion.h
  storage/falcon/SRLSequencePage.h
  storage/falcon/SRLUpdateBlob.h
  storage/falcon/SRLUpdateIndex.h
  storage/falcon/SRLUpdateRecords.cpp
  storage/falcon/SRLUpdateRecords.h
  storage/falcon/SerialLog.cpp
  storage/falcon/SerialLog.h
  storage/falcon/SerialLogRecord.cpp
  storage/falcon/SerialLogRecord.h
  storage/falcon/StorageTable.cpp
  storage/falcon/StorageVersion.h
  storage/falcon/Table.cpp
  storage/falcon/Table.h
  storage/falcon/Transaction.cpp
  storage/falcon/TransformLib/StringTransform.cpp
  storage/falcon/Value.cpp
  storage/falcon/ha_falcon.cpp
  storage/falcon/ha_falcon.h
  storage/falcon/plug.in
  storage/heap/CMakeLists.txt
  storage/heap/Makefile.am
  storage/innobase/CMakeLists.txt
  storage/innobase/handler/ha_innodb.cc
  storage/innobase/handler/ha_innodb.h
  storage/innobase/pars/make_bison.sh
  storage/innobase/pars/make_flex.sh
  storage/maria/CMakeLists.txt
  storage/maria/KNOWN_BUGS.txt
  storage/maria/Makefile.am
  storage/maria/ha_maria.cc
  storage/maria/ha_maria.h
  storage/maria/ma_bitmap.c
  storage/maria/ma_blockrec.c
  storage/maria/ma_blockrec.h
  storage/maria/ma_checkpoint.c
  storage/maria/ma_close.c
  storage/maria/ma_commit.c
  storage/maria/ma_control_file.c
  storage/maria/ma_delete.c
  storage/maria/ma_extra.c
  storage/maria/ma_key.c
  storage/maria/ma_loghandler.c
  storage/maria/ma_open.c
  storage/maria/ma_pagecache.c
  storage/maria/ma_recovery.c
  storage/maria/ma_rkey.c
  storage/maria/ma_rnext.c
  storage/maria/ma_rnext_same.c
  storage/maria/ma_state.c
  storage/maria/ma_state.h
  storage/maria/ma_test1.c
  storage/maria/ma_test2.c
  storage/maria/ma_test_big.sh
  storage/maria/ma_update.c
  storage/maria/ma_write.c
  storage/maria/maria_def.h
  storage/maria/trnman.c
  storage/maria/trnman_public.h
  storage/maria/unittest/CMakeLists.txt
  storage/maria/unittest/Makefile.am
  storage/myisam/CMakeLists.txt
  storage/myisam/Makefile.am
  storage/myisam/ha_myisam.cc
  storage/myisam/ha_myisam.h
  storage/myisam/mi_open.c
  storage/myisam/mi_test_all.sh
  storage/myisam/myisam_backup_engine.cc
  storage/myisam/myisampack.c
  storage/myisammrg/CMakeLists.txt
  storage/myisammrg/ha_myisammrg.cc
  storage/ndb/Makefile.am
  storage/ndb/config/common.mk.am
  storage/ndb/config/type_ndbapitest.mk.am
  storage/ndb/config/type_ndbapitools.mk.am
  storage/ndb/demos/run_demo1-PS.sh
  storage/ndb/demos/run_demo1-SS.sh
  storage/ndb/docs/doxygen/postdoxy.pl
  storage/ndb/include/debugger/SignalLoggerManager.hpp
  storage/ndb/include/kernel/Interpreter.hpp
  storage/ndb/include/kernel/NodeState.hpp
  storage/ndb/include/kernel/signaldata/AttrInfo.hpp
  storage/ndb/include/kernel/signaldata/DictLock.hpp
  storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp
  storage/ndb/include/kernel/signaldata/KeyInfo.hpp
  storage/ndb/include/kernel/signaldata/ListTables.hpp
  storage/ndb/include/kernel/signaldata/SumaImpl.hpp
  storage/ndb/include/logger/LogHandler.hpp
  storage/ndb/include/logger/Logger.hpp
  storage/ndb/include/mgmapi/mgmapi.h
  storage/ndb/include/mgmapi/mgmapi_config_parameters.h
  storage/ndb/include/mgmapi/mgmapi_debug.h
  storage/ndb/include/mgmapi/mgmapi_error.h
  storage/ndb/include/mgmapi/ndb_logevent.h
  storage/ndb/include/ndb_constants.h
  storage/ndb/include/ndb_version.h.in
  storage/ndb/include/ndbapi/Ndb.hpp
  storage/ndb/include/ndbapi/NdbApi.hpp
  storage/ndb/include/ndbapi/NdbBlob.hpp
  storage/ndb/include/ndbapi/NdbDictionary.hpp
  storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp
  storage/ndb/include/ndbapi/NdbIndexStat.hpp
  storage/ndb/include/ndbapi/NdbInterpretedCode.hpp
  storage/ndb/include/ndbapi/NdbOperation.hpp
  storage/ndb/include/ndbapi/NdbRecAttr.hpp
  storage/ndb/include/ndbapi/NdbReceiver.hpp
  storage/ndb/include/ndbapi/NdbScanFilter.hpp
  storage/ndb/include/ndbapi/NdbScanOperation.hpp
  storage/ndb/include/ndbapi/NdbTransaction.hpp
  storage/ndb/include/util/BaseString.hpp
  storage/ndb/include/util/InputStream.hpp
  storage/ndb/include/util/NdbOut.hpp
  storage/ndb/include/util/OutputStream.hpp
  storage/ndb/include/util/SimpleProperties.hpp
  storage/ndb/include/util/SocketServer.hpp
  storage/ndb/include/util/basestring_vsnprintf.h
  storage/ndb/include/util/ndb_opts.h
  storage/ndb/include/util/socket_io.h
  storage/ndb/ndbapi-examples/Makefile
  storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile
  storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile
  storage/ndb/ndbapi-examples/ndbapi_async/Makefile
  storage/ndb/ndbapi-examples/ndbapi_async1/Makefile
  storage/ndb/ndbapi-examples/ndbapi_blob/Makefile
  storage/ndb/ndbapi-examples/ndbapi_blob_ndbrecord/Makefile
  storage/ndb/ndbapi-examples/ndbapi_blob_ndbrecord/main.cpp
  storage/ndb/ndbapi-examples/ndbapi_event/Makefile
  storage/ndb/ndbapi-examples/ndbapi_retries/Makefile
  storage/ndb/ndbapi-examples/ndbapi_s_i_ndbrecord/Makefile
  storage/ndb/ndbapi-examples/ndbapi_s_i_ndbrecord/main.cpp
  storage/ndb/ndbapi-examples/ndbapi_scan/Makefile
  storage/ndb/ndbapi-examples/ndbapi_simple/Makefile
  storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile
  storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile
  storage/ndb/src/Makefile.am
  storage/ndb/src/common/debugger/EventLogger.cpp
  storage/ndb/src/common/debugger/signaldata/SignalNames.cpp
  storage/ndb/src/common/logger/LogHandler.cpp
  storage/ndb/src/common/logger/Logger.cpp
  storage/ndb/src/common/portlib/NdbCondition.c
  storage/ndb/src/common/portlib/NdbTick.c
  storage/ndb/src/common/transporter/TCP_Transporter.cpp
  storage/ndb/src/common/transporter/Transporter.cpp
  storage/ndb/src/common/transporter/TransporterRegistry.cpp
  storage/ndb/src/common/util/BaseString.cpp
  storage/ndb/src/common/util/Makefile.am
  storage/ndb/src/common/util/OutputStream.cpp
  storage/ndb/src/common/util/SocketServer.cpp
  storage/ndb/src/common/util/socket_io.cpp
  storage/ndb/src/common/util/version.c
  storage/ndb/src/cw/cpcd/APIService.cpp
  storage/ndb/src/cw/cpcd/Makefile.am
  storage/ndb/src/cw/cpcd/Process.cpp
  storage/ndb/src/cw/cpcd/main.cpp
  storage/ndb/src/kernel/Makefile.am
  storage/ndb/src/kernel/blocks/ERROR_codes.txt
  storage/ndb/src/kernel/blocks/Makefile.am
  storage/ndb/src/kernel/blocks/backup/Backup.cpp
  storage/ndb/src/kernel/blocks/backup/Makefile.am
  storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
  storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp
  storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
  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/dbdict/Makefile.am
  storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
  storage/ndb/src/kernel/blocks/dbdih/Makefile.am
  storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
  storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
  storage/ndb/src/kernel/blocks/dblqh/Makefile.am
  storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
  storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
  storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp
  storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
  storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp
  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
  storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
  storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp
  storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
  storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp
  storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp
  storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
  storage/ndb/src/kernel/blocks/dbtup/Makefile.am
  storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp
  storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.hpp
  storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp
  storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp
  storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp
  storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp
  storage/ndb/src/kernel/blocks/lgman.cpp
  storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp
  storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
  storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
  storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
  storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp
  storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
  storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
  storage/ndb/src/kernel/blocks/restore.cpp
  storage/ndb/src/kernel/blocks/suma/Suma.cpp
  storage/ndb/src/kernel/blocks/suma/Suma.hpp
  storage/ndb/src/kernel/blocks/suma/SumaInit.cpp
  storage/ndb/src/kernel/blocks/trix/Trix.cpp
  storage/ndb/src/kernel/blocks/trix/Trix.hpp
  storage/ndb/src/kernel/blocks/tsman.cpp
  storage/ndb/src/kernel/error/ErrorReporter.cpp
  storage/ndb/src/kernel/main.cpp
  storage/ndb/src/kernel/vm/Configuration.cpp
  storage/ndb/src/kernel/vm/Emulator.cpp
  storage/ndb/src/kernel/vm/LongSignal.hpp
  storage/ndb/src/kernel/vm/Makefile.am
  storage/ndb/src/kernel/vm/RequestTracker.hpp
  storage/ndb/src/kernel/vm/SafeCounter.cpp
  storage/ndb/src/kernel/vm/SafeCounter.hpp
  storage/ndb/src/kernel/vm/SimplePropertiesSection.cpp
  storage/ndb/src/kernel/vm/SimulatedBlock.cpp
  storage/ndb/src/kernel/vm/SimulatedBlock.hpp
  storage/ndb/src/kernel/vm/TransporterCallback.cpp
  storage/ndb/src/kernel/vm/WatchDog.cpp
  storage/ndb/src/kernel/vm/bench_pool.cpp
  storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp
  storage/ndb/src/kernel/vm/pc.hpp
  storage/ndb/src/mgmapi/LocalConfig.cpp
  storage/ndb/src/mgmapi/mgmapi.cpp
  storage/ndb/src/mgmclient/CommandInterpreter.cpp
  storage/ndb/src/mgmclient/Makefile.am
  storage/ndb/src/mgmsrv/ConfigInfo.cpp
  storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
  storage/ndb/src/mgmsrv/Makefile.am
  storage/ndb/src/mgmsrv/MgmtSrvr.cpp
  storage/ndb/src/mgmsrv/MgmtSrvr.hpp
  storage/ndb/src/mgmsrv/Services.cpp
  storage/ndb/src/mgmsrv/main.cpp
  storage/ndb/src/ndbapi/ClusterMgr.cpp
  storage/ndb/src/ndbapi/DictCache.cpp
  storage/ndb/src/ndbapi/DictCache.hpp
  storage/ndb/src/ndbapi/Makefile.am
  storage/ndb/src/ndbapi/Ndb.cpp
  storage/ndb/src/ndbapi/NdbApiSignal.hpp
  storage/ndb/src/ndbapi/NdbBlob.cpp
  storage/ndb/src/ndbapi/NdbDictionary.cpp
  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
  storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
  storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
  storage/ndb/src/ndbapi/NdbIndexStat.cpp
  storage/ndb/src/ndbapi/NdbInterpretedCode.cpp
  storage/ndb/src/ndbapi/NdbOperation.cpp
  storage/ndb/src/ndbapi/NdbOperationDefine.cpp
  storage/ndb/src/ndbapi/NdbOperationExec.cpp
  storage/ndb/src/ndbapi/NdbOperationInt.cpp
  storage/ndb/src/ndbapi/NdbOperationSearch.cpp
  storage/ndb/src/ndbapi/NdbRecAttr.cpp
  storage/ndb/src/ndbapi/NdbReceiver.cpp
  storage/ndb/src/ndbapi/NdbRecord.hpp
  storage/ndb/src/ndbapi/NdbScanFilter.cpp
  storage/ndb/src/ndbapi/NdbScanOperation.cpp
  storage/ndb/src/ndbapi/NdbTransaction.cpp
  storage/ndb/src/ndbapi/Ndbif.cpp
  storage/ndb/src/ndbapi/Ndbinit.cpp
  storage/ndb/src/ndbapi/ObjectMap.cpp
  storage/ndb/src/ndbapi/ObjectMap.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/ndberror.c
  storage/ndb/test/include/AtrtClient.hpp
  storage/ndb/test/include/DbUtil.hpp
  storage/ndb/test/include/HugoAsynchTransactions.hpp
  storage/ndb/test/include/HugoOperations.hpp
  storage/ndb/test/include/HugoTransactions.hpp
  storage/ndb/test/include/NDBT_Test.hpp
  storage/ndb/test/include/NdbRestarter.hpp
  storage/ndb/test/ndbapi/Makefile.am
  storage/ndb/test/ndbapi/ScanFilter.hpp
  storage/ndb/test/ndbapi/ScanFunctions.hpp
  storage/ndb/test/ndbapi/ScanInterpretTest.hpp
  storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp
  storage/ndb/test/ndbapi/bank/Bank.cpp
  storage/ndb/test/ndbapi/bank/BankLoad.cpp
  storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp
  storage/ndb/test/ndbapi/bench/ndb_async2.cpp
  storage/ndb/test/ndbapi/bench/testData.h
  storage/ndb/test/ndbapi/flexAsynch.cpp
  storage/ndb/test/ndbapi/flexBench.cpp
  storage/ndb/test/ndbapi/flexScan.cpp
  storage/ndb/test/ndbapi/msa.cpp
  storage/ndb/test/ndbapi/testBlobs.cpp
  storage/ndb/test/ndbapi/testDataBuffers.cpp
  storage/ndb/test/ndbapi/testDict.cpp
  storage/ndb/test/ndbapi/testIndex.cpp
  storage/ndb/test/ndbapi/testIndexStat.cpp
  storage/ndb/test/ndbapi/testInterpreter.cpp
  storage/ndb/test/ndbapi/testNDBT.cpp
  storage/ndb/test/ndbapi/testNdbApi.cpp
  storage/ndb/test/ndbapi/testNodeRestart.cpp
  storage/ndb/test/ndbapi/testOIBasic.cpp
  storage/ndb/test/ndbapi/testOperations.cpp
  storage/ndb/test/ndbapi/testPartitioning.cpp
  storage/ndb/test/ndbapi/testSRBank.cpp
  storage/ndb/test/ndbapi/testScan.cpp
  storage/ndb/test/ndbapi/testScanFilter.cpp
  storage/ndb/test/ndbapi/testScanPerf.cpp
  storage/ndb/test/ndbapi/testSystemRestart.cpp
  storage/ndb/test/ndbapi/testTransactions.cpp
  storage/ndb/test/ndbapi/test_event.cpp
  storage/ndb/test/run-test/Makefile.am
  storage/ndb/test/run-test/atrt-analyze-result.sh
  storage/ndb/test/run-test/atrt.hpp
  storage/ndb/test/run-test/autotest-boot.sh
  storage/ndb/test/run-test/autotest-run.sh
  storage/ndb/test/run-test/daily-basic-tests.txt
  storage/ndb/test/run-test/daily-devel-tests.txt
  storage/ndb/test/run-test/files.cpp
  storage/ndb/test/run-test/main.cpp
  storage/ndb/test/run-test/setup.cpp
  storage/ndb/test/run-test/test-tests.txt
  storage/ndb/test/src/AtrtClient.cpp
  storage/ndb/test/src/CpcClient.cpp
  storage/ndb/test/src/DbUtil.cpp
  storage/ndb/test/src/HugoAsynchTransactions.cpp
  storage/ndb/test/src/HugoOperations.cpp
  storage/ndb/test/src/HugoTransactions.cpp
  storage/ndb/test/src/NDBT_Tables.cpp
  storage/ndb/test/src/NDBT_Test.cpp
  storage/ndb/test/src/NdbBackup.cpp
  storage/ndb/test/src/NdbRestarter.cpp
  storage/ndb/test/src/UtilTransactions.cpp
  storage/ndb/test/tools/connect.cpp
  storage/ndb/test/tools/hugoPkRead.cpp
  storage/ndb/test/tools/rep_latency.cpp
  storage/ndb/tools/desc.cpp
  storage/ndb/tools/ndb_size.pl
  storage/ndb/tools/restore/Restore.cpp
  storage/ndb/tools/restore/consumer_restore.cpp
  storage/ndb/tools/restore/restore_main.cpp
  storage/ndb/tools/select_all.cpp
  storage/ndb/tools/select_count.cpp
  storage/ndb/tools/waiter.cpp
  strings/CMakeLists.txt
  strings/Makefile.am
  strings/conf_to_src.c
  support-files/build-tags
  support-files/compiler_warnings.supp
  support-files/my-small.cnf.sh
  support-files/mysql.spec.sh
  tests/CMakeLists.txt
  unittest/examples/CMakeLists.txt
  unittest/mysys/CMakeLists.txt
  unittest/mysys/Makefile.am
  unittest/mytap/CMakeLists.txt
  vio/CMakeLists.txt
  zlib/CMakeLists.txt
  mysql-test/r/slave_allow_batching_basic.result
  mysql-test/r/slave_compressed_protocol_basic.result
  mysql-test/suite/ndb_binlog/r/ndb_binlog_basic.result
  mysql-test/suite/ndb_binlog/r/ndb_binlog_ddl_multi.result
  mysql-test/suite/ndb_binlog/r/ndb_binlog_log_bin.result
  mysql-test/suite/ndb_binlog/t/ndb_binlog_basic.test
  mysql-test/suite/ndb_binlog/r/ndb_binlog_format.result
  mysql-test/t/slave_allow_batching_basic.test
  mysql-test/t/slave_compressed_protocol_basic.test
  storage/ndb/src/common/util/ndb_init.cpp

=== modified file 'mysql-test/include/commit.inc'
--- a/mysql-test/include/commit.inc	2008-12-12 19:55:12 +0000
+++ b/mysql-test/include/commit.inc	2009-01-09 11:00:01 +0000
@@ -617,10 +617,10 @@ call p_verify_status_increment(0, 0, 0, 
 --echo
 --echo # No test because of Bug#8729 "rename table fails on temporary table"
 
---echo # 24. DDL: TRUNCATE TEMPORARY TABLE, does not start a transaction
+--echo # 24. DDL: TRUNCATE TEMPORARY TABLE
 --echo
 truncate table t2;
-call p_verify_status_increment(2, 0, 2, 0);
+call p_verify_status_increment(4, 0, 4, 0);
 commit;
 --echo # There is nothing left to commit
 call p_verify_status_increment(0, 0, 0, 0);
@@ -733,7 +733,7 @@ call p_verify_status_increment(2, 0, 2, 
 rename table t4 to t3;
 call p_verify_status_increment(0, 0, 0, 0);
 truncate table t3;
-call p_verify_status_increment(2, 2, 2, 2);
+call p_verify_status_increment(4, 4, 2, 2);
 create view v1 as select * from t2;
 call p_verify_status_increment(2, 0, 2, 0);
 check table t1;

=== modified file 'mysql-test/r/commit_1innodb.result'
--- a/mysql-test/r/commit_1innodb.result	2008-12-12 19:55:12 +0000
+++ b/mysql-test/r/commit_1innodb.result	2009-01-09 11:00:01 +0000
@@ -683,10 +683,10 @@ SUCCESS
 # 23. DDL: RENAME TEMPORARY TABLE, does not start a transaction
 
 # No test because of Bug#8729 "rename table fails on temporary table"
-# 24. DDL: TRUNCATE TEMPORARY TABLE, does not start a transaction
+# 24. DDL: TRUNCATE TEMPORARY TABLE
 
 truncate table t2;
-call p_verify_status_increment(2, 0, 2, 0);
+call p_verify_status_increment(4, 0, 4, 0);
 SUCCESS
 
 commit;
@@ -853,7 +853,7 @@ call p_verify_status_increment(0, 0, 0, 
 SUCCESS
 
 truncate table t3;
-call p_verify_status_increment(2, 2, 2, 2);
+call p_verify_status_increment(4, 4, 2, 2);
 SUCCESS
 
 create view v1 as select * from t2;

=== modified file 'mysql-test/r/innodb_mysql.result'
--- a/mysql-test/r/innodb_mysql.result	2009-01-08 18:53:43 +0000
+++ b/mysql-test/r/innodb_mysql.result	2009-01-09 11:00:01 +0000
@@ -1789,4 +1789,62 @@ DEALLOCATE PREPARE stmt1;
 DEALLOCATE PREPARE stmt3;
 DROP TABLE t1,t3,t2;
 DROP FUNCTION f1;
+DROP TABLE IF EXISTS t1,t2;
+CREATE TABLE t1 (id INT NOT NULL, PRIMARY KEY (id)) ENGINE=INNODB;
+CREATE TABLE t2 (id INT PRIMARY KEY,
+t1_id INT, INDEX par_ind (t1_id),
+FOREIGN KEY (t1_id) REFERENCES t1(id)) ENGINE=INNODB;
+INSERT INTO t1 VALUES (1),(2);
+INSERT INTO t2 VALUES (3,2);
+SET AUTOCOMMIT = 0;
+START TRANSACTION;
+TRUNCATE TABLE t1;
+ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails
(`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`t1_id`) REFERENCES `t1` (`id`))
+SELECT * FROM t1;
+id
+1
+2
+COMMIT;
+SELECT * FROM t1;
+id
+1
+2
+START TRANSACTION;
+TRUNCATE TABLE t1;
+ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails
(`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`t1_id`) REFERENCES `t1` (`id`))
+SELECT * FROM t1;
+id
+1
+2
+ROLLBACK;
+SELECT * FROM t1;
+id
+1
+2
+SET AUTOCOMMIT = 1;
+START TRANSACTION;
+SELECT * FROM t1;
+id
+1
+2
+COMMIT;
+TRUNCATE TABLE t1;
+ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails
(`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`t1_id`) REFERENCES `t1` (`id`))
+SELECT * FROM t1;
+id
+1
+2
+DELETE FROM t2 WHERE id = 3;
+START TRANSACTION;
+SELECT * FROM t1;
+id
+1
+2
+TRUNCATE TABLE t1;
+ROLLBACK;
+SELECT * FROM t1;
+id
+TRUNCATE TABLE t2;
+DROP TABLE t2;
+DROP TABLE t1;
 End of 5.1 tests

=== modified file 'mysql-test/t/innodb_mysql.test'
--- a/mysql-test/t/innodb_mysql.test	2009-01-07 12:11:37 +0000
+++ b/mysql-test/t/innodb_mysql.test	2009-01-09 10:20:32 +0000
@@ -132,4 +132,56 @@ DEALLOCATE PREPARE stmt3;
 DROP TABLE t1,t3,t2;
 DROP FUNCTION f1;
 
+#
+# Bug#37016: TRUNCATE TABLE removes some rows but not all
+#
+
+--disable_warnings
+DROP TABLE IF EXISTS t1,t2;
+--enable_warnings
+
+CREATE TABLE t1 (id INT NOT NULL, PRIMARY KEY (id)) ENGINE=INNODB;
+CREATE TABLE t2 (id INT PRIMARY KEY,
+                 t1_id INT, INDEX par_ind (t1_id),
+                 FOREIGN KEY (t1_id) REFERENCES t1(id)) ENGINE=INNODB;
+INSERT INTO t1 VALUES (1),(2);
+INSERT INTO t2 VALUES (3,2);
+
+SET AUTOCOMMIT = 0;
+
+START TRANSACTION;
+--error ER_ROW_IS_REFERENCED_2
+TRUNCATE TABLE t1;
+SELECT * FROM t1;
+COMMIT;
+SELECT * FROM t1;
+
+START TRANSACTION;
+--error ER_ROW_IS_REFERENCED_2
+TRUNCATE TABLE t1;
+SELECT * FROM t1;
+ROLLBACK;
+SELECT * FROM t1;
+
+SET AUTOCOMMIT = 1;
+
+START TRANSACTION;
+SELECT * FROM t1;
+COMMIT;
+
+--error ER_ROW_IS_REFERENCED_2
+TRUNCATE TABLE t1;
+SELECT * FROM t1;
+DELETE FROM t2 WHERE id = 3;
+
+START TRANSACTION;
+SELECT * FROM t1;
+TRUNCATE TABLE t1;
+ROLLBACK;
+SELECT * FROM t1;
+TRUNCATE TABLE t2;
+
+DROP TABLE t2;
+DROP TABLE t1;
+
 --echo End of 5.1 tests

=== modified file 'sql/sql_delete.cc'
--- a/sql/sql_delete.cc	2008-12-14 11:36:15 +0000
+++ b/sql/sql_delete.cc	2009-01-09 11:00:01 +0000
@@ -23,6 +23,7 @@
 #include "sql_select.h"
 #include "sp_head.h"
 #include "sql_trigger.h"
+#include "transaction.h"
 
 /**
   Implement DELETE SQL word.
@@ -967,6 +968,35 @@ bool multi_delete::send_eof()
 ****************************************************************************/
 
 /*
+  Row-by-row truncation if the engine does not support table recreation.
+  Probably a InnoDB table.
+*/
+
+static bool mysql_truncate_by_delete(THD *thd, TABLE_LIST *table_list)
+{
+  bool error, save_binlog_row_based= thd->current_stmt_binlog_row_based;
+  DBUG_ENTER("mysql_truncate_by_delete");
+  table_list->lock_type= TL_WRITE;
+  mysql_init_select(thd->lex);
+  thd->clear_current_stmt_binlog_row_based();
+  /* Delete all rows from table */
+  error= mysql_delete(thd, table_list, NULL, NULL, HA_POS_ERROR, LL(0), TRUE);
+  /*
+    All effects of a TRUNCATE TABLE operation are rolled back if a row by row
+    deletion fails. Otherwise, operation is automatically committed at the end.
+  */
+  if (error)
+  {
+    DBUG_ASSERT(thd->stmt_da->is_error());
+    trans_rollback_stmt(thd);
+    trans_rollback(thd);
+  }
+  thd->current_stmt_binlog_row_based= save_binlog_row_based;
+  DBUG_RETURN(error);
+}
+
+
+/*
   Optimize delete of all rows by doing a full generate of the table
   This will work even if the .ISM and .ISD tables are destroyed
 
@@ -1104,21 +1134,6 @@ end:
   DBUG_RETURN(error);
 
 trunc_by_del:
-  /* Probably InnoDB table */
-  ulonglong save_options= thd->options;
-  bool save_binlog_row_based= thd->current_stmt_binlog_row_based;
-
-  table_list->lock_type= TL_WRITE;
-  thd->options&= ~(OPTION_BEGIN | OPTION_NOT_AUTOCOMMIT);
-  ha_enable_transaction(thd, FALSE);
-  mysql_init_select(thd->lex);
-  thd->clear_current_stmt_binlog_row_based();
-
-  /* Delete all rows from table */
-  error= mysql_delete(thd, table_list, (COND*) 0, (SQL_LIST*) 0,
-                      HA_POS_ERROR, LL(0), TRUE);
-  ha_enable_transaction(thd, TRUE);
-  thd->options= save_options;
-  thd->current_stmt_binlog_row_based= save_binlog_row_based;
+  error= mysql_truncate_by_delete(thd, table_list);
   DBUG_RETURN(error);
 }

Thread
bzr push into mysql-6.0-bugteam branch (davi:2944 to 2945) Bug#37016Davi Arnaut9 Jan 2009