- Commit merged files

removed:
  libmysql/libmysql.ver.in
  libmysql/rpm_support.cc
  mysql-test/r/backup.result
  mysql-test/r/binlog_tx_isolation.result
  mysql-test/r/isam.result
  mysql-test/r/rpl_colSize.result
  mysql-test/r/rpl_extraColmaster_innodb.result
  mysql-test/r/rpl_extraColmaster_myisam.result
  mysql-test/r/slave-running.result
  mysql-test/r/slave-stopped.result
  storage/test_sql_discovery/mysql-test/archive/discover.rdiff
  storage/test_sql_discovery/mysql-test/main/r/plugin.rdiff
  storage/tokudb/ft-index/portability/tests/test-fair-rwlock.cc
  storage/tokudb/ft-index/portability/toku_fair_rwlock.cc
  storage/tokudb/ft-index/portability/toku_fair_rwlock.h
  storage/tokudb/scripts/run.tests.7.0.3.bash
added:
  cmake/CPackRPM.cmake
  cmake/pcre.cmake
  mysql-test/include/have_metadata_lock_info.inc
  mysql-test/include/have_metadata_lock_info.opt
  mysql-test/include/have_rbr_triggers.inc
  mysql-test/include/have_unix_socket.inc
  mysql-test/include/save_master_gtid.inc
  mysql-test/include/sync_with_master_gtid.inc
  mysql-test/r/create_or_replace.result
  mysql-test/r/create_or_replace2.result
  mysql-test/r/failed_auth_unixsocket.result
  mysql-test/r/locked_temporary-5955.result
  mysql-test/r/lowercase_table5.result
  mysql-test/r/selectivity_no_engine.result
  mysql-test/r/stack-crash.result
  mysql-test/r/udf_debug_sync.result
  mysql-test/r/union_crash-714.result
  mysql-test/std_data/mariadb-5.5-binlog.000001
  mysql-test/suite/archive/archive_no_symlink-master.opt
  mysql-test/suite/archive/archive_no_symlink.result
  mysql-test/suite/archive/archive_no_symlink.test
  mysql-test/suite/archive/archive_symlink.result
  mysql-test/suite/archive/archive_symlink.test
  mysql-test/suite/federated/federated_maybe_16324629.result
  mysql-test/suite/federated/federated_maybe_16324629.test
  mysql-test/suite/innodb/r/innodb-change-buffer-recovery.result
  mysql-test/suite/innodb/r/row_lock.result
  mysql-test/suite/innodb/t/innodb-change-buffer-recovery-master.opt
  mysql-test/suite/innodb/t/innodb-change-buffer-recovery.test
  mysql-test/suite/innodb/t/row_lock.test
  mysql-test/suite/innodb_zip/
  mysql-test/suite/innodb_zip/r/
  mysql-test/suite/innodb_zip/t/
  mysql-test/suite/multi_source/gtid_ignore_duplicates.cnf
  mysql-test/suite/multi_source/gtid_ignore_duplicates.result
  mysql-test/suite/multi_source/gtid_ignore_duplicates.test
  mysql-test/suite/plugins/r/server_audit.result
  mysql-test/suite/plugins/t/server_audit.opt
  mysql-test/suite/plugins/t/server_audit.test
  mysql-test/suite/roles/grant-5771.result
  mysql-test/suite/roles/grant-5771.test
  mysql-test/suite/rpl/r/create_or_replace_mix.result
  mysql-test/suite/rpl/r/create_or_replace_row.result
  mysql-test/suite/rpl/r/create_or_replace_statement.result
  mysql-test/suite/rpl/r/rpl_old_master.result
  mysql-test/suite/rpl/r/rpl_parallel2.result
  mysql-test/suite/rpl/r/rpl_row_triggers.result
  mysql-test/suite/rpl/r/rpl_row_triggers_sbr.result
  mysql-test/suite/rpl/t/create_or_replace.inc
  mysql-test/suite/rpl/t/create_or_replace_mix.cnf
  mysql-test/suite/rpl/t/create_or_replace_mix.test
  mysql-test/suite/rpl/t/create_or_replace_row.cnf
  mysql-test/suite/rpl/t/create_or_replace_row.test
  mysql-test/suite/rpl/t/create_or_replace_statement.cnf
  mysql-test/suite/rpl/t/create_or_replace_statement.test
  mysql-test/suite/rpl/t/rpl_000011-slave.opt
  mysql-test/suite/rpl/t/rpl_old_master.test
  mysql-test/suite/rpl/t/rpl_parallel2.test
  mysql-test/suite/rpl/t/rpl_row_triggers.test
  mysql-test/suite/rpl/t/rpl_row_triggers_sbr.test
  mysql-test/suite/sys_vars/r/gtid_ignore_duplicates_basic.result
  mysql-test/suite/sys_vars/r/last_gtid_basic.result
  mysql-test/suite/sys_vars/r/slave_ddl_exec_mode_basic.result
  mysql-test/suite/sys_vars/r/slave_domain_parallel_threads_basic.result
  mysql-test/suite/sys_vars/r/version_malloc_library_basic.result
  mysql-test/suite/sys_vars/t/gtid_ignore_duplicates_basic.test
  mysql-test/suite/sys_vars/t/last_gtid_basic.test
  mysql-test/suite/sys_vars/t/slave_ddl_exec_mode_basic.test
  mysql-test/suite/sys_vars/t/slave_domain_parallel_threads_basic.test
  mysql-test/suite/sys_vars/t/version_malloc_library_basic.test
  mysql-test/t/create_or_replace-master.opt
  mysql-test/t/create_or_replace.test
  mysql-test/t/create_or_replace2.test
  mysql-test/t/failed_auth_unixsocket.test
  mysql-test/t/locked_temporary-5955.test
  mysql-test/t/lowercase_table5.test
  mysql-test/t/selectivity_no_engine.test
  mysql-test/t/stack-crash.test
  mysql-test/t/udf_debug_sync.test
  mysql-test/t/union_crash-714.test
  packaging/rpm-oel/
  packaging/rpm-oel/CMakeLists.txt
  packaging/rpm-oel/filter-provides.sh
  packaging/rpm-oel/filter-requires.sh
  packaging/rpm-oel/my.cnf
  packaging/rpm-oel/my_config.h
  packaging/rpm-oel/mysql-embedded-check.c
  packaging/rpm-oel/mysql-systemd-start
  packaging/rpm-oel/mysql.conf
  packaging/rpm-oel/mysql.init
  packaging/rpm-oel/mysql.spec.in
  packaging/rpm-oel/mysql_config.sh
  packaging/rpm-oel/mysqld.service
  plugin/server_audit/
  plugin/server_audit/CMakeLists.txt
  plugin/server_audit/COPYING
  plugin/server_audit/server_audit.c
  storage/connect/mysql-test/connect/r/xml_mult.result
  storage/connect/mysql-test/connect/std_data/bookstore.xml
  storage/connect/mysql-test/connect/t/xml_mult.test
  storage/oqgraph/mysql-test/oqgraph/connections_mdev5748.result
  storage/oqgraph/mysql-test/oqgraph/connections_mdev5748.test
  storage/oqgraph/mysql-test/oqgraph/regression_mdev5744.opt
  storage/oqgraph/mysql-test/oqgraph/regression_mdev5744.result
  storage/oqgraph/mysql-test/oqgraph/regression_mdev5744.test
  storage/sphinx/mysql-test/sphinx/union-5539.result
  storage/sphinx/mysql-test/sphinx/union-5539.test
  storage/tokudb/ft-index/ft/tests/mempool-115.cc
  storage/tokudb/ft-index/locktree/tests/lock_request_killed.cc
  storage/tokudb/ft-index/locktree/tests/lock_request_not_killed.cc
  storage/tokudb/ft-index/locktree/tests/lock_request_wait_time_callback.cc
  storage/tokudb/ft-index/locktree/tests/locktree_escalation_1big7lt_1small.cc
  storage/tokudb/ft-index/locktree/tests/locktree_escalation_2big_1lt.cc
  storage/tokudb/ft-index/locktree/tests/locktree_escalation_2big_2lt.cc
  storage/tokudb/ft-index/locktree/tests/locktree_escalation_impossible.cc
  storage/tokudb/ft-index/src/tests/env_nproc.cc
  storage/tokudb/ft-index/src/tests/get_last_key.cc
  storage/tokudb/ft-index/src/tests/locktree_escalation_stalls.cc
  storage/tokudb/ft-index/src/tests/recover-child-rollback.cc
  storage/tokudb/ft-index/src/tests/test_bad_implicit_promotion.cc
  storage/tokudb/ft-index/src/tests/test_cursor_interrupt.cc
  storage/tokudb/ft-index/src/tests/test_insert_many_gc.cc
  storage/tokudb/ft-index/util/context.cc
  storage/tokudb/ft-index/util/context.h
  storage/tokudb/ft-index/util/scoped_malloc.cc
  storage/tokudb/ft-index/util/scoped_malloc.h
  storage/tokudb/ft-index/util/tests/test-frwlock-fair-writers.cc
  storage/tokudb/ft-index/util/tests/test-rwlock-unfair-writers.cc
  storage/tokudb/mysql-test/tokudb_alter_table/r/drop_pk_with_prefix.result
  storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_drop_char0_t6.result
  storage/tokudb/mysql-test/tokudb_alter_table/r/mod_enum.result
  storage/tokudb/mysql-test/tokudb_alter_table/r/null_bytes_add_key.result
  storage/tokudb/mysql-test/tokudb_alter_table/r/null_bytes_col_rename.result
  storage/tokudb/mysql-test/tokudb_alter_table/r/null_bytes_drop_default.result
  storage/tokudb/mysql-test/tokudb_alter_table/r/null_bytes_drop_key.result
  storage/tokudb/mysql-test/tokudb_alter_table/t/drop_pk_with_prefix.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_drop_char0_t6.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/mod_enum.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/null_bytes_add_key.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/null_bytes_col_rename.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/null_bytes_drop_default.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/null_bytes_drop_key.test
  storage/tokudb/mysql-test/tokudb_bugs/include/not_5_5.inc
  storage/tokudb/mysql-test/tokudb_bugs/r/alter_external_lock_assert.result
  storage/tokudb/mysql-test/tokudb_bugs/r/alter_part_tokudb_bug_155.result
  storage/tokudb/mysql-test/tokudb_bugs/r/alter_table_copy_table.result
  storage/tokudb/mysql-test/tokudb_bugs/r/commit_index_end_1.result
  storage/tokudb/mysql-test/tokudb_bugs/r/commit_index_end_2.result
  storage/tokudb/mysql-test/tokudb_bugs/r/leak172.result
  storage/tokudb/mysql-test/tokudb_bugs/r/optimize_temp_table_tokudb.result
  storage/tokudb/mysql-test/tokudb_bugs/r/subselect_index_next_same_bug_157.result
  storage/tokudb/mysql-test/tokudb_bugs/std_data/
  storage/tokudb/mysql-test/tokudb_bugs/std_data/leak172_t1.data
  storage/tokudb/mysql-test/tokudb_bugs/std_data/leak172_t2.data
  storage/tokudb/mysql-test/tokudb_bugs/t/alter_external_lock_assert.test
  storage/tokudb/mysql-test/tokudb_bugs/t/alter_part_tokudb_bug_155.test
  storage/tokudb/mysql-test/tokudb_bugs/t/alter_table_copy_table.test
  storage/tokudb/mysql-test/tokudb_bugs/t/commit_index_end_1.test
  storage/tokudb/mysql-test/tokudb_bugs/t/commit_index_end_2.test
  storage/tokudb/mysql-test/tokudb_bugs/t/leak172.test
  storage/tokudb/mysql-test/tokudb_bugs/t/optimize_temp_table_tokudb.test
  storage/tokudb/mysql-test/tokudb_bugs/t/subselect_index_next_same_bug_157.test
  storage/tokudb/mysql-test/tokudb_mariadb/r/create_or_replace.result
  storage/tokudb/mysql-test/tokudb_mariadb/r/discover_names.result
  storage/tokudb/mysql-test/tokudb_mariadb/t/create_or_replace.test
  storage/tokudb/mysql-test/tokudb_mariadb/t/discover_names.test
renamed:
  libmysql/libmysql_rpm_version.in => libmysql/libmysql_versions.ld.in
  mysql-test/suite/innodb/r/innodb-create-options.result => mysql-test/suite/innodb_zip/r/innodb-create-options.result
  mysql-test/suite/innodb/r/innodb-zip.result => mysql-test/suite/innodb_zip/r/innodb-zip.result
  mysql-test/suite/innodb/r/innodb_bug36169.result => mysql-test/suite/innodb_zip/r/innodb_bug36169.result
  mysql-test/suite/innodb/r/innodb_bug36172.result => mysql-test/suite/innodb_zip/r/innodb_bug36172.result
  mysql-test/suite/innodb/r/innodb_bug52745.result => mysql-test/suite/innodb_zip/r/innodb_bug52745.result
  mysql-test/suite/innodb/r/innodb_bug53591.result => mysql-test/suite/innodb_zip/r/innodb_bug53591.result
  mysql-test/suite/innodb/r/innodb_bug56680.result => mysql-test/suite/innodb_zip/r/innodb_bug56680.result
  mysql-test/suite/innodb/r/innodb_cmp_drop_table.result => mysql-test/suite/innodb_zip/r/innodb_cmp_drop_table.result
  mysql-test/suite/innodb/r/innodb_index_large_prefix.result => mysql-test/suite/innodb_zip/r/innodb_index_large_prefix.result
  mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result => mysql-test/suite/innodb_zip/r/innodb_prefix_index_liftedlimit.result
  mysql-test/suite/innodb/t/innodb-create-options.test => mysql-test/suite/innodb_zip/t/innodb-create-options.test
  mysql-test/suite/innodb/t/innodb-zip.test => mysql-test/suite/innodb_zip/t/innodb-zip.test
  mysql-test/suite/innodb/t/innodb_bug36169.test => mysql-test/suite/innodb_zip/t/innodb_bug36169.test
  mysql-test/suite/innodb/t/innodb_bug36172.test => mysql-test/suite/innodb_zip/t/innodb_bug36172.test
  mysql-test/suite/innodb/t/innodb_bug52745.test => mysql-test/suite/innodb_zip/t/innodb_bug52745.test
  mysql-test/suite/innodb/t/innodb_bug53591.test => mysql-test/suite/innodb_zip/t/innodb_bug53591.test
  mysql-test/suite/innodb/t/innodb_bug56680.test => mysql-test/suite/innodb_zip/t/innodb_bug56680.test
  mysql-test/suite/innodb/t/innodb_cmp_drop_table-master.opt => mysql-test/suite/innodb_zip/t/innodb_cmp_drop_table-master.opt
  mysql-test/suite/innodb/t/innodb_cmp_drop_table.test => mysql-test/suite/innodb_zip/t/innodb_cmp_drop_table.test
  mysql-test/suite/innodb/t/innodb_index_large_prefix.test => mysql-test/suite/innodb_zip/t/innodb_index_large_prefix.test
  mysql-test/suite/innodb/t/innodb_prefix_index_liftedlimit.test => mysql-test/suite/innodb_zip/t/innodb_prefix_index_liftedlimit.test
  mysql-test/suite/roles/show_grants_anon-5238.result => mysql-test/suite/roles/grant_empty.result
  mysql-test/suite/roles/show_grants_anon-5238.test => mysql-test/suite/roles/grant_empty.test
modified:
  .bzrignore
  CMakeLists.txt
  CREDITS
  VERSION
  client/CMakeLists.txt
  client/mysql.cc
  client/mysql_plugin.c
  client/mysqlcheck.c
  client/mysqldump.c
  client/mysqltest.cc
  cmake/cpack_rpm.cmake
  cmake/install_macros.cmake
  cmake/jemalloc.cmake
  cmake/mysql_add_executable.cmake
  cmake/plugin.cmake
  cmake/versioninfo.rc.in
  cmake/zlib.cmake
  config.h.cmake
  dbug/dbug.c
  debian/dist/Debian/mariadb-server-10.0.files.in
  debian/dist/Ubuntu/mariadb-server-10.0.files.in
  debian/po/it.po
  debian/po/sv.po
  extra/jemalloc/ChangeLog
  extra/jemalloc/include/jemalloc/internal/arena.h
  extra/jemalloc/include/jemalloc/internal/jemalloc_internal.h.in
  extra/jemalloc/include/jemalloc/internal/private_namespace.h
  extra/jemalloc/include/jemalloc/internal/tcache.h
  extra/jemalloc/src/arena.c
  extra/replace.c
  extra/yassl/CMakeLists.txt
  extra/yassl/include/yassl_error.hpp
  extra/yassl/include/yassl_types.hpp
  extra/yassl/src/handshake.cpp
  extra/yassl/src/yassl_error.cpp
  extra/yassl/src/yassl_imp.cpp
  extra/yassl/taocrypt/CMakeLists.txt
  include/atomic/gcc_builtins.h
  include/hash.h
  include/heap.h
  include/ma_dyncol.h
  include/maria.h
  include/my_bitmap.h
  include/my_getopt.h
  include/my_global.h
  include/my_net.h
  include/my_pthread.h
  include/my_sys.h
  include/my_time.h
  include/my_valgrind.h
  include/myisam.h
  include/mysql/plugin.h
  include/mysql/plugin_audit.h
  include/mysql/plugin_audit.h.pp
  include/mysql/plugin_auth.h.pp
  include/mysql/plugin_ftparser.h.pp
  include/mysql/psi/mysql_thread.h
  include/queues.h
  include/welcome_copyright_notice.h
  libmysql/CMakeLists.txt
  libmysql/conf_to_src.c
  libmysql/libmysql.c
  libmysqld/CMakeLists.txt
  libmysqld/examples/CMakeLists.txt
  libmysqld/lib_sql.cc
  mysql-test/CMakeLists.txt
  mysql-test/collections/default.weekly
  mysql-test/extra/rpl_tests/rpl_ddl.test
  mysql-test/extra/rpl_tests/rpl_log.test
  mysql-test/extra/rpl_tests/rpl_stop_slave.test
  mysql-test/include/commit.inc
  mysql-test/include/ctype_filesort2.inc
  mysql-test/include/have_innodb.combinations
  mysql-test/include/index_merge_ror_cpk.inc
  mysql-test/include/mtr_check.sql
  mysql-test/include/type_hrtime.inc
  mysql-test/lib/My/Config.pm
  mysql-test/lib/My/SafeProcess/safe_process.cc
  mysql-test/lib/My/SysInfo.pm
  mysql-test/lib/mtr_cases.pm
  mysql-test/mysql-test-run.pl
  mysql-test/r/alter_table.result
  mysql-test/r/blackhole.result
  mysql-test/r/cast.result
  mysql-test/r/comment_column.result
  mysql-test/r/comments.result
  mysql-test/r/commit_1innodb.result
  mysql-test/r/contributors.result
  mysql-test/r/create-big.result
  mysql-test/r/create.result
  mysql-test/r/ctype_binary.result
  mysql-test/r/ctype_cp1250_ch.result
  mysql-test/r/ctype_cp1251.result
  mysql-test/r/ctype_latin1.result
  mysql-test/r/ctype_ucs.result
  mysql-test/r/ctype_utf16.result
  mysql-test/r/ctype_utf16le.result
  mysql-test/r/ctype_utf32.result
  mysql-test/r/ctype_utf8.result
  mysql-test/r/ctype_utf8mb4.result
  mysql-test/r/derived_view.result
  mysql-test/r/distinct.result
  mysql-test/r/drop.result
  mysql-test/r/dyncol.result
  mysql-test/r/error_simulation.result
  mysql-test/r/events_trans.result
  mysql-test/r/func_compress.result
  mysql-test/r/func_group.result
  mysql-test/r/func_math.result
  mysql-test/r/func_misc.result
  mysql-test/r/func_regexp.result
  mysql-test/r/func_str.result
  mysql-test/r/func_time.result
  mysql-test/r/gis-precise.result
  mysql-test/r/gis.result
  mysql-test/r/index_intersect_innodb.result
  mysql-test/r/index_merge_innodb.result
  mysql-test/r/index_merge_myisam.result
  mysql-test/r/information_schema-big.result
  mysql-test/r/information_schema.result
  mysql-test/r/information_schema_all_engines.result
  mysql-test/r/innodb_ext_key.result
  mysql-test/r/join.result
  mysql-test/r/join_outer.result
  mysql-test/r/join_outer_jcl6.result
  mysql-test/r/key.result
  mysql-test/r/lowercase_fs_off.result
  mysql-test/r/lowercase_table.result
  mysql-test/r/lowercase_table2.result
  mysql-test/r/lowercase_view.result
  mysql-test/r/merge.result
  mysql-test/r/multi_update.result
  mysql-test/r/myisampack.result
  mysql-test/r/mysqld--help.result
  mysql-test/r/mysqldump.result
  mysql-test/r/not_embedded_server.result
  mysql-test/r/not_partition.result
  mysql-test/r/old-mode.result
  mysql-test/r/partition.result
  mysql-test/r/partition_debug_sync.result
  mysql-test/r/partition_disabled.result
  mysql-test/r/partition_error.result
  mysql-test/r/partition_exchange.result
  mysql-test/r/partition_innodb.result
  mysql-test/r/partition_order.result
  mysql-test/r/partition_windows.result
  mysql-test/r/plugin.result
  mysql-test/r/plugin_auth_qa_3.result
  mysql-test/r/ps.result
  mysql-test/r/ps_ddl.result
  mysql-test/r/range.result
  mysql-test/r/range_mrr_icp.result
  mysql-test/r/range_vs_index_merge.result
  mysql-test/r/range_vs_index_merge_innodb.result
  mysql-test/r/rpl_mysqldump_slave.result
  mysql-test/r/select.result
  mysql-test/r/select_found.result
  mysql-test/r/select_jcl6.result
  mysql-test/r/select_pkeycache.result
  mysql-test/r/selectivity.result
  mysql-test/r/selectivity_innodb.result
  mysql-test/r/show_check.result
  mysql-test/r/sp-security.result
  mysql-test/r/ssl.result
  mysql-test/r/stat_tables.result
  mysql-test/r/stat_tables_innodb.result
  mysql-test/r/stat_tables_par.result
  mysql-test/r/stat_tables_par_innodb.result
  mysql-test/r/stat_tables_partition.result
  mysql-test/r/stat_tables_rbr.result
  mysql-test/r/stat_tables_repl.result
  mysql-test/r/statistics.result
  mysql-test/r/subselect.result
  mysql-test/r/subselect2.result
  mysql-test/r/subselect4.result
  mysql-test/r/subselect_exists2in.result
  mysql-test/r/subselect_exists_to_in.result
  mysql-test/r/subselect_extra.result
  mysql-test/r/subselect_innodb.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_scache.result
  mysql-test/r/subselect_no_semijoin.result
  mysql-test/r/subselect_sj.result
  mysql-test/r/subselect_sj2.result
  mysql-test/r/subselect_sj2_jcl6.result
  mysql-test/r/subselect_sj2_mat.result
  mysql-test/r/subselect_sj_jcl6.result
  mysql-test/r/subselect_sj_mat.result
  mysql-test/r/temporal_literal.result
  mysql-test/r/timezone2.result
  mysql-test/r/trigger.result
  mysql-test/r/type_datetime.result
  mysql-test/r/type_datetime_hires.result
  mysql-test/r/type_float.result
  mysql-test/r/type_time.result
  mysql-test/r/type_time_hires.result
  mysql-test/r/type_timestamp_hires.result
  mysql-test/r/update.result
  mysql-test/r/variables.result
  mysql-test/r/view.result
  mysql-test/r/view_grant.result
  mysql-test/r/xml.result
  mysql-test/std_data/cacert.pem
  mysql-test/std_data/client-cert.pem
  mysql-test/std_data/client-key.pem
  mysql-test/std_data/server-cert.pem
  mysql-test/std_data/server-key.pem
  mysql-test/std_data/server8k-cert.pem
  mysql-test/std_data/server8k-key.pem
  mysql-test/suite.pm
  mysql-test/suite/archive/discover.result
  mysql-test/suite/archive/discover.test
  mysql-test/suite/binlog/r/binlog_checkpoint.result
  mysql-test/suite/binlog/t/binlog_checkpoint.test
  mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_options.test
  mysql-test/suite/csv/csv.result
  mysql-test/suite/csv/csv.test
  mysql-test/suite/federated/federated.test
  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/is_columns_is.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-big.result
  mysql-test/suite/funcs_1/views/func_view.inc
  mysql-test/suite/heap/heap.result
  mysql-test/suite/heap/heap.test
  mysql-test/suite/innodb/r/innodb_bug54044.result
  mysql-test/suite/innodb/r/innodb_information_schema.result
  mysql-test/suite/innodb/r/innodb_mysql.result
  mysql-test/suite/innodb/t/innodb_bug54044.test
  mysql-test/suite/innodb/t/innodb_bug60196-master.opt
  mysql-test/suite/innodb/t/innodb_mysql.test
  mysql-test/suite/maria/icp.result
  mysql-test/suite/maria/maria-preload.result
  mysql-test/suite/maria/maria.result
  mysql-test/suite/maria/maria.test
  mysql-test/suite/multi_source/skip_counter.result
  mysql-test/suite/multi_source/skip_counter.test
  mysql-test/suite/optimizer_unfixed_bugs/t/bug42991.test
  mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result
  mysql-test/suite/parts/r/partition_mgm_lc2_memory.result
  mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result
  mysql-test/suite/perfschema/r/dml_setup_instruments.result
  mysql-test/suite/perfschema/r/func_mutex.result
  mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result
  mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result
  mysql-test/suite/perfschema/r/server_init.result
  mysql-test/suite/perfschema/t/func_mutex.test
  mysql-test/suite/perfschema/t/hostcache_ipv4_blocked.test
  mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test
  mysql-test/suite/perfschema/t/server_init.test
  mysql-test/suite/plugins/t/unix_socket.test
  mysql-test/suite/roles/recursive_dbug.result
  mysql-test/suite/rpl/disabled.def
  mysql-test/suite/rpl/r/rpl_000011.result
  mysql-test/suite/rpl/r/rpl_ddl.result
  mysql-test/suite/rpl/r/rpl_drop_view.result
  mysql-test/suite/rpl/r/rpl_gtid_basic.result
  mysql-test/suite/rpl/r/rpl_gtid_crash.result
  mysql-test/suite/rpl/r/rpl_gtid_errorhandling.result
  mysql-test/suite/rpl/r/rpl_gtid_ignored.result
  mysql-test/suite/rpl/r/rpl_gtid_nobinlog.result
  mysql-test/suite/rpl/r/rpl_gtid_startpos.result
  mysql-test/suite/rpl/r/rpl_gtid_stop_start.result
  mysql-test/suite/rpl/r/rpl_mariadb_slave_capability.result
  mysql-test/suite/rpl/r/rpl_mdev382.result
  mysql-test/suite/rpl/r/rpl_parallel.result
  mysql-test/suite/rpl/r/rpl_parallel_no_log_slave_updates.result
  mysql-test/suite/rpl/r/rpl_row_create_table.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_show_relaylog_events.result
  mysql-test/suite/rpl/r/rpl_stm_log.result
  mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result
  mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result
  mysql-test/suite/rpl/t/rpl_000011.test
  mysql-test/suite/rpl/t/rpl_bug37426.test
  mysql-test/suite/rpl/t/rpl_connection.test
  mysql-test/suite/rpl/t/rpl_create_if_not_exists.test
  mysql-test/suite/rpl/t/rpl_drop_db.test
  mysql-test/suite/rpl/t/rpl_gtid_basic.test
  mysql-test/suite/rpl/t/rpl_gtid_crash.test
  mysql-test/suite/rpl/t/rpl_gtid_errorhandling.test
  mysql-test/suite/rpl/t/rpl_gtid_ignored.test
  mysql-test/suite/rpl/t/rpl_gtid_mdev4485.test
  mysql-test/suite/rpl/t/rpl_gtid_nobinlog.test
  mysql-test/suite/rpl/t/rpl_gtid_startpos.test
  mysql-test/suite/rpl/t/rpl_gtid_stop_start.test
  mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
  mysql-test/suite/rpl/t/rpl_known_bugs_detection.test
  mysql-test/suite/rpl/t/rpl_mariadb_slave_capability.test
  mysql-test/suite/rpl/t/rpl_mix_found_rows.test
  mysql-test/suite/rpl/t/rpl_parallel.test
  mysql-test/suite/rpl/t/rpl_parallel_no_log_slave_updates.test
  mysql-test/suite/rpl/t/rpl_row_create_table.test
  mysql-test/suite/rpl/t/rpl_row_find_row_debug.test
  mysql-test/suite/rpl/t/rpl_row_unsafe_funcs.test
  mysql-test/suite/rpl/t/rpl_row_utf32.test
  mysql-test/suite/rpl/t/rpl_stm_log.test
  mysql-test/suite/rpl/t/rpl_stm_sql_mode.test
  mysql-test/suite/rpl/t/rpl_stm_stop_middle_group.test
  mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test
  mysql-test/suite/sys_vars/r/back_log_basic.result
  mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result
  mysql-test/suite/sys_vars/r/innodb_monitor_disable_basic.result
  mysql-test/suite/sys_vars/r/innodb_monitor_enable_basic.result
  mysql-test/suite/sys_vars/r/innodb_monitor_reset_all_basic.result
  mysql-test/suite/sys_vars/r/innodb_monitor_reset_basic.result
  mysql-test/suite/sys_vars/r/old_mode_basic.result
  mysql-test/suite/sys_vars/r/optimizer_switch_basic.result
  mysql-test/suite/sys_vars/r/progress_report_time_basic.result
  mysql-test/suite/sys_vars/t/old_mode_basic.test
  mysql-test/suite/vcol/r/vcol_misc.result
  mysql-test/suite/vcol/t/vcol_misc.test
  mysql-test/t/aborted_clients.test
  mysql-test/t/alter_table.test
  mysql-test/t/auth_rpl.test
  mysql-test/t/blackhole.test
  mysql-test/t/cast.test
  mysql-test/t/comment_column.test
  mysql-test/t/comments.test
  mysql-test/t/create-big.test
  mysql-test/t/create.test
  mysql-test/t/derived_view.test
  mysql-test/t/distinct.test
  mysql-test/t/drop.test
  mysql-test/t/dyncol.test
  mysql-test/t/error_simulation.test
  mysql-test/t/events_trans.test
  mysql-test/t/func_compress.test
  mysql-test/t/func_gconcat.test
  mysql-test/t/func_group.test
  mysql-test/t/func_math.test
  mysql-test/t/func_misc.test
  mysql-test/t/func_regexp.test
  mysql-test/t/func_time.test
  mysql-test/t/gis-precise.test
  mysql-test/t/gis.test
  mysql-test/t/information_schema.test
  mysql-test/t/join.test
  mysql-test/t/key.test
  mysql-test/t/lowercase_table.test
  mysql-test/t/lowercase_table2.test
  mysql-test/t/lowercase_table4-master.opt
  mysql-test/t/lowercase_table4.test
  mysql-test/t/multi_update.test
  mysql-test/t/myisampack.test
  mysql-test/t/mysqld--help.test
  mysql-test/t/mysqldump.test
  mysql-test/t/not_embedded_server.test
  mysql-test/t/not_partition.test
  mysql-test/t/old-mode.test
  mysql-test/t/partition.test
  mysql-test/t/partition_debug_sync.test
  mysql-test/t/partition_disabled.test
  mysql-test/t/partition_error.test
  mysql-test/t/partition_exchange.test
  mysql-test/t/partition_innodb.test
  mysql-test/t/plugin.test
  mysql-test/t/ps.test
  mysql-test/t/ps_ddl.test
  mysql-test/t/range.test
  mysql-test/t/range_vs_index_merge.test
  mysql-test/t/rpl_mysqldump_slave.test
  mysql-test/t/select.test
  mysql-test/t/select_found.test
  mysql-test/t/selectivity.test
  mysql-test/t/show_check.test
  mysql-test/t/sp-security.test
  mysql-test/t/stat_tables_par.test
  mysql-test/t/statistics.test
  mysql-test/t/subselect4.test
  mysql-test/t/subselect_exists2in.test
  mysql-test/t/subselect_innodb.test
  mysql-test/t/subselect_sj.test
  mysql-test/t/subselect_sj2.test
  mysql-test/t/subselect_sj_mat.test
  mysql-test/t/temporal_literal.test
  mysql-test/t/timezone2.test
  mysql-test/t/type_float.test
  mysql-test/t/type_time.test
  mysql-test/t/update.test
  mysql-test/t/view.test
  mysql-test/t/view_grant.test
  mysql-test/t/xml.test
  mysql-test/valgrind.supp
  mysys/array.c
  mysys/file_logger.c
  mysys/hash.c
  mysys/ma_dyncol.c
  mysys/md5.c.THIS
  mysys/mf_iocache.c
  mysys/mf_keycache.c
  mysys/mf_qsort.c
  mysys/mf_radix.c
  mysys/mf_same.c
  mysys/mf_soundex.c
  mysys/mf_tempdir.c
  mysys/mf_tempfile.c
  mysys/mf_wcomp.c
  mysys/mulalloc.c
  mysys/my_access.c
  mysys/my_aes.c.THIS
  mysys/my_alloc.c
  mysys/my_bitmap.c
  mysys/my_conio.c
  mysys/my_copy.c
  mysys/my_crc32.c
  mysys/my_delete.c
  mysys/my_div.c
  mysys/my_error.c
  mysys/my_fopen.c
  mysys/my_gethwaddr.c
  mysys/my_getpagesize.c
  mysys/my_getwd.c
  mysys/my_libwrap.c
  mysys/my_lockmem.c
  mysys/my_malloc.c
  mysys/my_memmem.c
  mysys/my_mkdir.c
  mysys/my_once.c
  mysys/my_rename.c
  mysys/my_symlink2.c
  mysys/my_wincond.c
  mysys/my_winthread.c
  mysys/safemalloc.c
  mysys/test_dir.c
  mysys/test_xml.c
  mysys/thr_alarm.c
  mysys/thr_mutex.c
  mysys/tree.c
  packaging/WiX/CPackWixConfig.cmake
  packaging/WiX/custom_ui.wxs
  packaging/WiX/mysql_server.wxs.in
  plugin/auth_pam/auth_pam.c
  plugin/auth_socket/auth_socket.c
  plugin/daemon_example/daemon_example.cc
  plugin/feedback/CMakeLists.txt
  plugin/feedback/feedback.cc
  plugin/handler_socket/libhsclient/auto_file.hpp
  plugin/locale_info/locale_info.cc
  plugin/metadata_lock_info/metadata_lock_info.cc
  plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/user_lock.result
  plugin/qc_info/CMakeLists.txt
  plugin/qc_info/qc_info.cc
  plugin/query_response_time/mysql-test/query_response_time/basic.result
  plugin/query_response_time/plugin.cc
  plugin/sql_errlog/sql_errlog.c
  plugin/win_auth_client/CMakeLists.txt
  scripts/CMakeLists.txt
  scripts/mysql_config.pl.in
  scripts/mysql_config.sh
  scripts/mysql_install_db.pl.in
  scripts/mysql_install_db.sh
  scripts/mysql_system_tables.sql
  scripts/mysql_system_tables_fix.sql
  scripts/mysqlaccess.sh
  sql-bench/innotest1.sh
  sql-bench/innotest1a.sh
  sql-bench/innotest1b.sh
  sql-bench/innotest2.sh
  sql-bench/innotest2a.sh
  sql-bench/innotest2b.sh
  sql-bench/limits/access_odbc.cfg
  sql-common/client.c
  sql-common/my_time.c
  sql-common/mysql_async.c
  sql-common/pack.c
  sql/CMakeLists.txt
  sql/authors.h
  sql/contributors.h
  sql/create_options.cc
  sql/custom_conf.h
  sql/event_db_repository.cc
  sql/event_scheduler.cc
  sql/event_scheduler.h
  sql/events.cc
  sql/events.h
  sql/field.cc
  sql/field.h
  sql/field_conv.cc
  sql/filesort.cc
  sql/filesort_utils.h
  sql/ha_ndbcluster_binlog.cc
  sql/ha_ndbcluster_cond.cc
  sql/ha_ndbcluster_cond.h
  sql/ha_ndbcluster_tables.h
  sql/ha_partition.cc
  sql/ha_partition.h
  sql/handler.cc
  sql/handler.h
  sql/hash_filo.h
  sql/hostname.cc
  sql/item.cc
  sql/item.h
  sql/item_cmpfunc.cc
  sql/item_cmpfunc.h
  sql/item_create.cc
  sql/item_func.cc
  sql/item_func.h
  sql/item_geofunc.cc
  sql/item_strfunc.cc
  sql/item_strfunc.h
  sql/item_subselect.cc
  sql/item_subselect.h
  sql/item_sum.cc
  sql/item_sum.h
  sql/item_timefunc.cc
  sql/item_xmlfunc.cc
  sql/item_xmlfunc.h
  sql/key.cc
  sql/key.h
  sql/lex_symbol.h
  sql/lock.cc
  sql/log.cc
  sql/log.h
  sql/log_event.cc
  sql/log_event.h
  sql/log_event_old.cc
  sql/log_event_old.h
  sql/mdl.cc
  sql/mdl.h
  sql/mem_root_array.h
  sql/message.h
  sql/multi_range_read.cc
  sql/my_apc.h
  sql/my_decimal.h
  sql/mysqld.cc
  sql/mysqld.h
  sql/net_serv.cc
  sql/opt_index_cond_pushdown.cc
  sql/opt_range.cc
  sql/opt_range.h
  sql/opt_subselect.cc
  sql/opt_subselect.h
  sql/opt_sum.cc
  sql/opt_table_elimination.cc
  sql/partition_element.h
  sql/partition_info.cc
  sql/partition_info.h
  sql/password.c
  sql/rpl_filter.cc
  sql/rpl_gtid.cc
  sql/rpl_gtid.h
  sql/rpl_injector.h
  sql/rpl_mi.cc
  sql/rpl_parallel.cc
  sql/rpl_parallel.h
  sql/rpl_record.cc
  sql/rpl_record.h
  sql/rpl_rli.cc
  sql/rpl_rli.h
  sql/rpl_utility.cc
  sql/rpl_utility.h
  sql/scheduler.cc
  sql/scheduler.h
  sql/set_var.cc
  sql/set_var.h
  sql/share/charsets/Index.xml
  sql/share/charsets/armscii8.xml
  sql/share/charsets/ascii.xml
  sql/share/charsets/cp1250.xml
  sql/share/charsets/cp852.xml
  sql/share/charsets/hebrew.xml
  sql/share/charsets/latin1.xml
  sql/share/charsets/latin2.xml
  sql/share/charsets/latin5.xml
  sql/share/errmsg-utf8.txt
  sql/signal_handler.cc
  sql/slave.cc
  sql/sp_head.cc
  sql/sp_head.h
  sql/sp_rcontext.h
  sql/spatial.cc
  sql/sql_acl.cc
  sql/sql_admin.cc
  sql/sql_admin.h
  sql/sql_alter.cc
  sql/sql_analyse.cc
  sql/sql_analyse.h
  sql/sql_audit.cc
  sql/sql_audit.h
  sql/sql_base.cc
  sql/sql_base.h
  sql/sql_binlog.cc
  sql/sql_bitmap.h
  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_handler.cc
  sql/sql_help.cc
  sql/sql_insert.cc
  sql/sql_insert.h
  sql/sql_join_cache.cc
  sql/sql_lex.cc
  sql/sql_lex.h
  sql/sql_lifo_buffer.h
  sql/sql_list.h
  sql/sql_load.cc
  sql/sql_manager.cc
  sql/sql_parse.cc
  sql/sql_parse.h
  sql/sql_partition.cc
  sql/sql_partition_admin.cc
  sql/sql_plugin.cc
  sql/sql_prepare.cc
  sql/sql_prepare.h
  sql/sql_priv.h
  sql/sql_rename.cc
  sql/sql_repl.cc
  sql/sql_repl.h
  sql/sql_select.cc
  sql/sql_select.h
  sql/sql_servers.cc
  sql/sql_show.cc
  sql/sql_show.h
  sql/sql_statistics.cc
  sql/sql_statistics.h
  sql/sql_string.cc
  sql/sql_string.h
  sql/sql_table.cc
  sql/sql_table.h
  sql/sql_test.cc
  sql/sql_time.cc
  sql/sql_time.h
  sql/sql_trigger.cc
  sql/sql_truncate.cc
  sql/sql_udf.cc
  sql/sql_union.cc
  sql/sql_update.cc
  sql/sql_view.cc
  sql/sql_yacc.yy
  sql/strfunc.cc
  sql/sys_vars.cc
  sql/sys_vars.h
  sql/table.cc
  sql/table.h
  sql/table_cache.cc
  sql/table_cache.h
  sql/threadpool_unix.cc
  sql/transaction.cc
  sql/transaction.h
  sql/tztime.cc
  sql/uniques.cc
  sql/unireg.cc
  storage/archive/ha_archive.cc
  storage/cassandra/ha_cassandra.cc
  storage/connect/csort.cpp
  storage/connect/domdoc.cpp
  storage/connect/filamfix.cpp
  storage/connect/filamtxt.cpp
  storage/connect/filamvct.cpp
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h
  storage/connect/inihandl.c
  storage/connect/myconn.cpp
  storage/connect/odbconn.cpp
  storage/connect/os.h
  storage/connect/osutil.h
  storage/connect/plgdbutl.cpp
  storage/connect/reldef.cpp
  storage/connect/tabdos.cpp
  storage/connect/tabfmt.cpp
  storage/connect/tabmysql.cpp
  storage/connect/taboccur.cpp
  storage/connect/tabodbc.cpp
  storage/connect/tabxml.cpp
  storage/connect/tabxml.h
  storage/connect/valblk.cpp
  storage/connect/value.cpp
  storage/connect/xindex.cpp
  storage/example/ha_example.cc
  storage/example/ha_example.h
  storage/federated/ha_federated.cc
  storage/federated/ha_federated.h
  storage/federatedx/CMakeLists.txt
  storage/federatedx/federatedx_io_mysql.cc
  storage/federatedx/ha_federatedx.cc
  storage/heap/_check.c
  storage/heap/_rectest.c
  storage/heap/ha_heap.cc
  storage/heap/ha_heap.h
  storage/heap/hp_create.c
  storage/heap/hp_delete.c
  storage/heap/hp_extra.c
  storage/heap/hp_hash.c
  storage/heap/hp_open.c
  storage/heap/hp_rfirst.c
  storage/heap/hp_rlast.c
  storage/heap/hp_rnext.c
  storage/heap/hp_rprev.c
  storage/heap/hp_rrnd.c
  storage/heap/hp_rsame.c
  storage/heap/hp_scan.c
  storage/heap/hp_update.c
  storage/heap/hp_write.c
  storage/innobase/CMakeLists.txt
  storage/innobase/api/api0api.cc
  storage/innobase/btr/btr0btr.cc
  storage/innobase/btr/btr0cur.cc
  storage/innobase/btr/btr0pcur.cc
  storage/innobase/compile-innodb*
  storage/innobase/dict/dict0crea.cc
  storage/innobase/dict/dict0dict.cc
  storage/innobase/dict/dict0load.cc
  storage/innobase/dict/dict0mem.cc
  storage/innobase/dict/dict0stats.cc
  storage/innobase/fil/fil0fil.cc
  storage/innobase/fts/fts0config.cc
  storage/innobase/fts/fts0fts.cc
  storage/innobase/fts/fts0opt.cc
  storage/innobase/fts/fts0que.cc
  storage/innobase/handler/ha_innodb.cc
  storage/innobase/handler/handler0alter.cc
  storage/innobase/handler/i_s.cc
  storage/innobase/ibuf/ibuf0ibuf.cc
  storage/innobase/include/api0api.h
  storage/innobase/include/btr0cur.h
  storage/innobase/include/btr0pcur.h
  storage/innobase/include/btr0pcur.ic
  storage/innobase/include/btr0sea.h
  storage/innobase/include/db0err.h
  storage/innobase/include/dict0stats.ic
  storage/innobase/include/dict0types.h
  storage/innobase/include/fts0fts.h
  storage/innobase/include/fts0types.h
  storage/innobase/include/ibuf0ibuf.h
  storage/innobase/include/log0log.h
  storage/innobase/include/mtr0mtr.h
  storage/innobase/include/mtr0mtr.ic
  storage/innobase/include/os0file.h
  storage/innobase/include/row0ftsort.h
  storage/innobase/include/srv0conc.h
  storage/innobase/include/srv0mon.h
  storage/innobase/include/srv0mon.ic
  storage/innobase/include/sync0arr.h
  storage/innobase/include/sync0arr.ic
  storage/innobase/include/sync0sync.h
  storage/innobase/include/trx0trx.h
  storage/innobase/include/univ.i
  storage/innobase/include/ut0bh.h
  storage/innobase/include/ut0bh.ic
  storage/innobase/log/log0log.cc
  storage/innobase/mtr/mtr0mtr.cc
  storage/innobase/os/os0file.cc
  storage/innobase/os/os0thread.cc
  storage/innobase/pars/make_bison.sh*
  storage/innobase/pars/make_flex.sh*
  storage/innobase/row/row0ftsort.cc
  storage/innobase/row/row0log.cc
  storage/innobase/row/row0merge.cc
  storage/innobase/row/row0mysql.cc
  storage/innobase/row/row0quiesce.cc
  storage/innobase/row/row0sel.cc
  storage/innobase/srv/srv0mon.cc
  storage/innobase/srv/srv0start.cc
  storage/innobase/sync/sync0arr.cc
  storage/innobase/sync/sync0rw.cc
  storage/innobase/sync/sync0sync.cc
  storage/innobase/trx/trx0purge.cc
  storage/innobase/trx/trx0sys.cc
  storage/innobase/trx/trx0trx.cc
  storage/innobase/ut/ut0ut.cc
  storage/maria/ha_maria.cc
  storage/maria/ha_maria.h
  storage/maria/ma_blockrec.c
  storage/maria/ma_check.c
  storage/maria/ma_create.c
  storage/maria/ma_delete_table.c
  storage/maria/ma_dynrec.c
  storage/maria/ma_extra.c
  storage/maria/ma_ft_boolean_search.c
  storage/maria/ma_locking.c
  storage/maria/ma_loghandler.c
  storage/maria/ma_open.c
  storage/maria/ma_packrec.c
  storage/maria/ma_pagecache.c
  storage/maria/ma_pagecrc.c
  storage/maria/ma_range.c
  storage/maria/ma_recovery.c
  storage/maria/ma_static.c
  storage/maria/ma_test1.c
  storage/maria/ma_test2.c
  storage/maria/ma_test_force_start.pl
  storage/maria/ma_unique.c
  storage/maria/maria_chk.c
  storage/maria/maria_def.h
  storage/maria/maria_pack.c
  storage/maria/maria_read_log.c
  storage/maria/unittest/ma_pagecache_single.c
  storage/maria/unittest/ma_test_loghandler-t.c
  storage/maria/unittest/ma_test_loghandler_multigroup-t.c
  storage/myisam/ft_boolean_search.c
  storage/myisam/ft_stopwords.c
  storage/myisam/ftbench/Ecompare.pl
  storage/myisam/ftbench/Ecreate.pl
  storage/myisam/ftbench/Ereport.pl
  storage/myisam/ftbench/ft-test-run.sh
  storage/myisam/ha_myisam.cc
  storage/myisam/mi_check.c
  storage/myisam/mi_checksum.c
  storage/myisam/mi_create.c
  storage/myisam/mi_delete.c
  storage/myisam/mi_delete_table.c
  storage/myisam/mi_dynrec.c
  storage/myisam/mi_extra.c
  storage/myisam/mi_locking.c
  storage/myisam/mi_open.c
  storage/myisam/mi_rfirst.c
  storage/myisam/mi_rlast.c
  storage/myisam/mi_rrnd.c
  storage/myisam/mi_rsamepos.c
  storage/myisam/mi_scan.c
  storage/myisam/mi_search.c
  storage/myisam/mi_test1.c
  storage/myisam/mi_write.c
  storage/myisam/myisamchk.c
  storage/myisam/myisampack.c
  storage/myisam/rt_index.h
  storage/myisam/rt_key.c
  storage/myisam/rt_key.h
  storage/myisam/rt_mbr.c
  storage/myisam/rt_mbr.h
  storage/myisam/sp_defs.h
  storage/myisammrg/myrg_delete.c
  storage/myisammrg/myrg_locking.c
  storage/myisammrg/myrg_panic.c
  storage/myisammrg/myrg_range.c
  storage/myisammrg/myrg_rfirst.c
  storage/myisammrg/myrg_rlast.c
  storage/myisammrg/myrg_rnext.c
  storage/myisammrg/myrg_rnext_same.c
  storage/myisammrg/myrg_rprev.c
  storage/myisammrg/myrg_rrnd.c
  storage/myisammrg/myrg_rsame.c
  storage/myisammrg/myrg_update.c
  storage/myisammrg/myrg_write.c
  storage/ndb/config/win-includes
  storage/ndb/config/win-libraries
  storage/ndb/config/win-name
  storage/ndb/config/win-sources
  storage/ndb/include/debugger/DebuggerNames.hpp
  storage/ndb/include/debugger/EventLogger.hpp
  storage/ndb/include/debugger/GrepError.hpp
  storage/ndb/include/debugger/SignalLoggerManager.hpp
  storage/ndb/include/editline/editline.h
  storage/ndb/include/kernel/AttributeDescriptor.hpp
  storage/ndb/include/kernel/AttributeHeader.hpp
  storage/ndb/include/kernel/AttributeList.hpp
  storage/ndb/include/kernel/BlockNumbers.h
  storage/ndb/include/kernel/GlobalSignalNumbers.h
  storage/ndb/include/kernel/GrepEvent.hpp
  storage/ndb/include/kernel/Interpreter.hpp
  storage/ndb/include/kernel/LogLevel.hpp
  storage/ndb/include/kernel/NodeBitmask.hpp
  storage/ndb/include/kernel/NodeInfo.hpp
  storage/ndb/include/kernel/NodeState.hpp
  storage/ndb/include/kernel/RefConvert.hpp
  storage/ndb/include/kernel/kernel_types.h
  storage/ndb/include/kernel/ndb_limits.h
  storage/ndb/include/kernel/signaldata/AbortAll.hpp
  storage/ndb/include/kernel/signaldata/AccFrag.hpp
  storage/ndb/include/kernel/signaldata/AccLock.hpp
  storage/ndb/include/kernel/signaldata/AccScan.hpp
  storage/ndb/include/kernel/signaldata/AccSizeAltReq.hpp
  storage/ndb/include/kernel/signaldata/AllocNodeId.hpp
  storage/ndb/include/kernel/signaldata/AlterIndx.hpp
  storage/ndb/include/kernel/signaldata/AlterTab.hpp
  storage/ndb/include/kernel/signaldata/AlterTable.hpp
  storage/ndb/include/kernel/signaldata/AlterTrig.hpp
  storage/ndb/include/kernel/signaldata/ApiBroadcast.hpp
  storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp
  storage/ndb/include/kernel/signaldata/ApiVersion.hpp
  storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp
  storage/ndb/include/kernel/signaldata/AttrInfo.hpp
  storage/ndb/include/kernel/signaldata/BackupContinueB.hpp
  storage/ndb/include/kernel/signaldata/BackupImpl.hpp
  storage/ndb/include/kernel/signaldata/BackupSignalData.hpp
  storage/ndb/include/kernel/signaldata/BlockCommitOrd.hpp
  storage/ndb/include/kernel/signaldata/BuildIndx.hpp
  storage/ndb/include/kernel/signaldata/CheckNodeGroups.hpp
  storage/ndb/include/kernel/signaldata/CloseComReqConf.hpp
  storage/ndb/include/kernel/signaldata/CmInit.hpp
  storage/ndb/include/kernel/signaldata/CmRegSignalData.hpp
  storage/ndb/include/kernel/signaldata/CmvmiCfgConf.hpp
  storage/ndb/include/kernel/signaldata/CntrMasterConf.hpp
  storage/ndb/include/kernel/signaldata/CntrMasterReq.hpp
  storage/ndb/include/kernel/signaldata/ConfigParamId.hpp
  storage/ndb/include/kernel/signaldata/ContinueFragmented.hpp
  storage/ndb/include/kernel/signaldata/CopyActive.hpp
  storage/ndb/include/kernel/signaldata/CopyFrag.hpp
  storage/ndb/include/kernel/signaldata/CopyGCIReq.hpp
  storage/ndb/include/kernel/signaldata/CreateEvnt.hpp
  storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp
  storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp
  storage/ndb/include/kernel/signaldata/CreateFrag.hpp
  storage/ndb/include/kernel/signaldata/CreateFragmentation.hpp
  storage/ndb/include/kernel/signaldata/CreateIndx.hpp
  storage/ndb/include/kernel/signaldata/CreateObj.hpp
  storage/ndb/include/kernel/signaldata/CreateTab.hpp
  storage/ndb/include/kernel/signaldata/CreateTable.hpp
  storage/ndb/include/kernel/signaldata/CreateTrig.hpp
  storage/ndb/include/kernel/signaldata/DiAddTab.hpp
  storage/ndb/include/kernel/signaldata/DiGetNodes.hpp
  storage/ndb/include/kernel/signaldata/DictLock.hpp
  storage/ndb/include/kernel/signaldata/DictObjOp.hpp
  storage/ndb/include/kernel/signaldata/DictSchemaInfo.hpp
  storage/ndb/include/kernel/signaldata/DictSizeAltReq.hpp
  storage/ndb/include/kernel/signaldata/DictStart.hpp
  storage/ndb/include/kernel/signaldata/DictTabInfo.hpp
  storage/ndb/include/kernel/signaldata/DihAddFrag.hpp
  storage/ndb/include/kernel/signaldata/DihContinueB.hpp
  storage/ndb/include/kernel/signaldata/DihSizeAltReq.hpp
  storage/ndb/include/kernel/signaldata/DihStartTab.hpp
  storage/ndb/include/kernel/signaldata/DihSwitchReplica.hpp
  storage/ndb/include/kernel/signaldata/DisconnectRep.hpp
  storage/ndb/include/kernel/signaldata/DropFilegroup.hpp
  storage/ndb/include/kernel/signaldata/DropFilegroupImpl.hpp
  storage/ndb/include/kernel/signaldata/DropIndx.hpp
  storage/ndb/include/kernel/signaldata/DropObj.hpp
  storage/ndb/include/kernel/signaldata/DropTab.hpp
  storage/ndb/include/kernel/signaldata/DropTabFile.hpp
  storage/ndb/include/kernel/signaldata/DropTable.hpp
  storage/ndb/include/kernel/signaldata/DropTrig.hpp
  storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp
  storage/ndb/include/kernel/signaldata/EmptyLcp.hpp
  storage/ndb/include/kernel/signaldata/EndTo.hpp
  storage/ndb/include/kernel/signaldata/EventReport.hpp
  storage/ndb/include/kernel/signaldata/EventSubscribeReq.hpp
  storage/ndb/include/kernel/signaldata/ExecFragReq.hpp
  storage/ndb/include/kernel/signaldata/Extent.hpp
  storage/ndb/include/kernel/signaldata/FailRep.hpp
  storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp
  storage/ndb/include/kernel/signaldata/FsAppendReq.hpp
  storage/ndb/include/kernel/signaldata/FsCloseReq.hpp
  storage/ndb/include/kernel/signaldata/FsConf.hpp
  storage/ndb/include/kernel/signaldata/FsOpenReq.hpp
  storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp
  storage/ndb/include/kernel/signaldata/FsRef.hpp
  storage/ndb/include/kernel/signaldata/FsRemoveReq.hpp
  storage/ndb/include/kernel/signaldata/GCPSave.hpp
  storage/ndb/include/kernel/signaldata/GetTabInfo.hpp
  storage/ndb/include/kernel/signaldata/GetTableId.hpp
  storage/ndb/include/kernel/signaldata/GrepImpl.hpp
  storage/ndb/include/kernel/signaldata/HotSpareRep.hpp
  storage/ndb/include/kernel/signaldata/IndxAttrInfo.hpp
  storage/ndb/include/kernel/signaldata/IndxKeyInfo.hpp
  storage/ndb/include/kernel/signaldata/InvalidateNodeLCPConf.hpp
  storage/ndb/include/kernel/signaldata/InvalidateNodeLCPReq.hpp
  storage/ndb/include/kernel/signaldata/KeyInfo.hpp
  storage/ndb/include/kernel/signaldata/LCP.hpp
  storage/ndb/include/kernel/signaldata/LgmanContinueB.hpp
  storage/ndb/include/kernel/signaldata/ListTables.hpp
  storage/ndb/include/kernel/signaldata/LqhFrag.hpp
  storage/ndb/include/kernel/signaldata/LqhKey.hpp
  storage/ndb/include/kernel/signaldata/LqhSizeAltReq.hpp
  storage/ndb/include/kernel/signaldata/LqhTransConf.hpp
  storage/ndb/include/kernel/signaldata/ManagementServer.hpp
  storage/ndb/include/kernel/signaldata/MasterGCP.hpp
  storage/ndb/include/kernel/signaldata/MasterLCP.hpp
  storage/ndb/include/kernel/signaldata/NFCompleteRep.hpp
  storage/ndb/include/kernel/signaldata/NdbSttor.hpp
  storage/ndb/include/kernel/signaldata/NdbfsContinueB.hpp
  storage/ndb/include/kernel/signaldata/NextScan.hpp
  storage/ndb/include/kernel/signaldata/NodeFailRep.hpp
  storage/ndb/include/kernel/signaldata/NodeStateSignalData.hpp
  storage/ndb/include/kernel/signaldata/PackedSignal.hpp
  storage/ndb/include/kernel/signaldata/PgmanContinueB.hpp
  storage/ndb/include/kernel/signaldata/PrepDropTab.hpp
  storage/ndb/include/kernel/signaldata/PrepFailReqRef.hpp
  storage/ndb/include/kernel/signaldata/ReadNodesConf.hpp
  storage/ndb/include/kernel/signaldata/RelTabMem.hpp
  storage/ndb/include/kernel/signaldata/RepImpl.hpp
  storage/ndb/include/kernel/signaldata/RestoreContinueB.hpp
  storage/ndb/include/kernel/signaldata/RestoreImpl.hpp
  storage/ndb/include/kernel/signaldata/ResumeReq.hpp
  storage/ndb/include/kernel/signaldata/RouteOrd.hpp
  storage/ndb/include/kernel/signaldata/ScanFrag.hpp
  storage/ndb/include/kernel/signaldata/ScanTab.hpp
  storage/ndb/include/kernel/signaldata/SetLogLevelOrd.hpp
  storage/ndb/include/kernel/signaldata/SetVarReq.hpp
  storage/ndb/include/kernel/signaldata/SignalData.hpp
  storage/ndb/include/kernel/signaldata/SignalDataPrint.hpp
  storage/ndb/include/kernel/signaldata/SignalDroppedRep.hpp
  storage/ndb/include/kernel/signaldata/SrFragidConf.hpp
  storage/ndb/include/kernel/signaldata/StartFragReq.hpp
  storage/ndb/include/kernel/signaldata/StartInfo.hpp
  storage/ndb/include/kernel/signaldata/StartMe.hpp
  storage/ndb/include/kernel/signaldata/StartOrd.hpp
  storage/ndb/include/kernel/signaldata/StartPerm.hpp
  storage/ndb/include/kernel/signaldata/StartRec.hpp
  storage/ndb/include/kernel/signaldata/StartTo.hpp
  storage/ndb/include/kernel/signaldata/StopMe.hpp
  storage/ndb/include/kernel/signaldata/StopPerm.hpp
  storage/ndb/include/kernel/signaldata/StopReq.hpp
  storage/ndb/include/kernel/signaldata/SumaImpl.hpp
  storage/ndb/include/kernel/signaldata/SystemError.hpp
  storage/ndb/include/kernel/signaldata/TamperOrd.hpp
  storage/ndb/include/kernel/signaldata/TcCommit.hpp
  storage/ndb/include/kernel/signaldata/TcContinueB.hpp
  storage/ndb/include/kernel/signaldata/TcHbRep.hpp
  storage/ndb/include/kernel/signaldata/TcIndx.hpp
  storage/ndb/include/kernel/signaldata/TcKeyConf.hpp
  storage/ndb/include/kernel/signaldata/TcKeyFailConf.hpp
  storage/ndb/include/kernel/signaldata/TcKeyRef.hpp
  storage/ndb/include/kernel/signaldata/TcKeyReq.hpp
  storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp
  storage/ndb/include/kernel/signaldata/TcSizeAltReq.hpp
  storage/ndb/include/kernel/signaldata/TestOrd.hpp
  storage/ndb/include/kernel/signaldata/TransIdAI.hpp
  storage/ndb/include/kernel/signaldata/TrigAttrInfo.hpp
  storage/ndb/include/kernel/signaldata/TsmanContinueB.hpp
  storage/ndb/include/kernel/signaldata/TupCommit.hpp
  storage/ndb/include/kernel/signaldata/TupFrag.hpp
  storage/ndb/include/kernel/signaldata/TupKey.hpp
  storage/ndb/include/kernel/signaldata/TupSizeAltReq.hpp
  storage/ndb/include/kernel/signaldata/TuxBound.hpp
  storage/ndb/include/kernel/signaldata/TuxContinueB.hpp
  storage/ndb/include/kernel/signaldata/TuxMaint.hpp
  storage/ndb/include/kernel/signaldata/TuxSizeAltReq.hpp
  storage/ndb/include/kernel/signaldata/UpdateTo.hpp
  storage/ndb/include/kernel/signaldata/UtilDelete.hpp
  storage/ndb/include/kernel/signaldata/UtilExecute.hpp
  storage/ndb/include/kernel/signaldata/UtilLock.hpp
  storage/ndb/include/kernel/signaldata/UtilPrepare.hpp
  storage/ndb/include/kernel/signaldata/UtilRelease.hpp
  storage/ndb/include/kernel/signaldata/UtilSequence.hpp
  storage/ndb/include/kernel/signaldata/WaitGCP.hpp
  storage/ndb/include/kernel/trigger_definitions.h
  storage/ndb/include/logger/ConsoleLogHandler.hpp
  storage/ndb/include/logger/FileLogHandler.hpp
  storage/ndb/include/logger/LogHandler.hpp
  storage/ndb/include/logger/Logger.hpp
  storage/ndb/include/logger/SysLogHandler.hpp
  storage/ndb/include/mgmapi/mgmapi.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/mgmapi/ndbd_exit_codes.h
  storage/ndb/include/mgmcommon/ConfigRetriever.hpp
  storage/ndb/include/mgmcommon/IPCConfig.hpp
  storage/ndb/include/mgmcommon/MgmtErrorReporter.hpp
  storage/ndb/include/ndb_constants.h
  storage/ndb/include/ndb_global.h.in
  storage/ndb/include/ndb_init.h
  storage/ndb/include/ndb_types.h.in
  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/NdbError.hpp
  storage/ndb/include/ndbapi/NdbEventOperation.hpp
  storage/ndb/include/ndbapi/NdbIndexOperation.hpp
  storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp
  storage/ndb/include/ndbapi/NdbIndexStat.hpp
  storage/ndb/include/ndbapi/NdbOperation.hpp
  storage/ndb/include/ndbapi/NdbPool.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/ndbapi/ndb_cluster_connection.hpp
  storage/ndb/include/ndbapi/ndb_opt_defaults.h
  storage/ndb/include/ndbapi/ndbapi_limits.h
  storage/ndb/include/ndbapi/ndberror.h
  storage/ndb/include/newtonapi/dba.h
  storage/ndb/include/newtonapi/defs/pcn_types.h
  storage/ndb/include/portlib/NdbCondition.h
  storage/ndb/include/portlib/NdbConfig.h
  storage/ndb/include/portlib/NdbDaemon.h
  storage/ndb/include/portlib/NdbEnv.h
  storage/ndb/include/portlib/NdbHost.h
  storage/ndb/include/portlib/NdbMain.h
  storage/ndb/include/portlib/NdbMem.h
  storage/ndb/include/portlib/NdbMutex.h
  storage/ndb/include/portlib/NdbSleep.h
  storage/ndb/include/portlib/NdbTCP.h
  storage/ndb/include/portlib/NdbThread.h
  storage/ndb/include/portlib/NdbTick.h
  storage/ndb/include/portlib/PortDefs.h
  storage/ndb/include/portlib/prefetch.h
  storage/ndb/include/transporter/TransporterCallback.hpp
  storage/ndb/include/transporter/TransporterDefinitions.hpp
  storage/ndb/include/transporter/TransporterRegistry.hpp
  storage/ndb/include/util/BaseString.hpp
  storage/ndb/include/util/Bitmask.hpp
  storage/ndb/include/util/File.hpp
  storage/ndb/include/util/InputStream.hpp
  storage/ndb/include/util/NdbAutoPtr.hpp
  storage/ndb/include/util/NdbOut.hpp
  storage/ndb/include/util/NdbSqlUtil.hpp
  storage/ndb/include/util/OutputStream.hpp
  storage/ndb/include/util/Parser.hpp
  storage/ndb/include/util/Properties.hpp
  storage/ndb/include/util/SimpleProperties.hpp
  storage/ndb/include/util/SocketAuthenticator.hpp
  storage/ndb/include/util/SocketClient.hpp
  storage/ndb/include/util/SocketServer.hpp
  storage/ndb/include/util/UtilBuffer.hpp
  storage/ndb/include/util/Vector.hpp
  storage/ndb/include/util/basestring_vsnprintf.h
  storage/ndb/include/util/md5_hash.hpp
  storage/ndb/include/util/ndb_opts.h
  storage/ndb/include/util/ndb_rand.h
  storage/ndb/include/util/random.h
  storage/ndb/include/util/socket_io.h
  storage/ndb/include/util/uucode.h
  storage/ndb/include/util/version.h
  storage/ndb/ndbapi-examples/mgmapi_logevent/main.cpp
  storage/ndb/ndbapi-examples/mgmapi_logevent2/main.cpp
  storage/ndb/ndbapi-examples/ndbapi_async/ndbapi_async.cpp
  storage/ndb/ndbapi-examples/ndbapi_async1/ndbapi_async1.cpp
  storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event.cpp
  storage/ndb/ndbapi-examples/ndbapi_retries/ndbapi_retries.cpp
  storage/ndb/ndbapi-examples/ndbapi_scan/ndbapi_scan.cpp
  storage/ndb/ndbapi-examples/ndbapi_simple/ndbapi_simple.cpp
  storage/ndb/ndbapi-examples/ndbapi_simple_dual/main.cpp
  storage/ndb/ndbapi-examples/ndbapi_simple_index/main.cpp
  storage/ndb/src/common/debugger/BlockNames.cpp
  storage/ndb/src/common/debugger/DebuggerNames.cpp
  storage/ndb/src/common/debugger/EventLogger.cpp
  storage/ndb/src/common/debugger/GrepError.cpp
  storage/ndb/src/common/debugger/SignalLoggerManager.cpp
  storage/ndb/src/common/debugger/signaldata/AccLock.cpp
  storage/ndb/src/common/debugger/signaldata/AlterIndx.cpp
  storage/ndb/src/common/debugger/signaldata/AlterTab.cpp
  storage/ndb/src/common/debugger/signaldata/AlterTable.cpp
  storage/ndb/src/common/debugger/signaldata/AlterTrig.cpp
  storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp
  storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp
  storage/ndb/src/common/debugger/signaldata/CloseComReqConf.cpp
  storage/ndb/src/common/debugger/signaldata/ContinueB.cpp
  storage/ndb/src/common/debugger/signaldata/CopyGCI.cpp
  storage/ndb/src/common/debugger/signaldata/CreateEvnt.cpp
  storage/ndb/src/common/debugger/signaldata/CreateFragmentation.cpp
  storage/ndb/src/common/debugger/signaldata/CreateIndx.cpp
  storage/ndb/src/common/debugger/signaldata/CreateTrig.cpp
  storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp
  storage/ndb/src/common/debugger/signaldata/DihContinueB.cpp
  storage/ndb/src/common/debugger/signaldata/DihSwitchReplicaReq.cpp
  storage/ndb/src/common/debugger/signaldata/DisconnectRep.cpp
  storage/ndb/src/common/debugger/signaldata/DropIndx.cpp
  storage/ndb/src/common/debugger/signaldata/DropTab.cpp
  storage/ndb/src/common/debugger/signaldata/DropTrig.cpp
  storage/ndb/src/common/debugger/signaldata/FailRep.cpp
  storage/ndb/src/common/debugger/signaldata/FireTrigOrd.cpp
  storage/ndb/src/common/debugger/signaldata/FsAppendReq.cpp
  storage/ndb/src/common/debugger/signaldata/FsCloseReq.cpp
  storage/ndb/src/common/debugger/signaldata/FsConf.cpp
  storage/ndb/src/common/debugger/signaldata/FsOpenReq.cpp
  storage/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp
  storage/ndb/src/common/debugger/signaldata/FsRef.cpp
  storage/ndb/src/common/debugger/signaldata/GCPSave.cpp
  storage/ndb/src/common/debugger/signaldata/IndxAttrInfo.cpp
  storage/ndb/src/common/debugger/signaldata/IndxKeyInfo.cpp
  storage/ndb/src/common/debugger/signaldata/LCP.cpp
  storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp
  storage/ndb/src/common/debugger/signaldata/LqhKey.cpp
  storage/ndb/src/common/debugger/signaldata/LqhTrans.cpp
  storage/ndb/src/common/debugger/signaldata/MasterLCP.cpp
  storage/ndb/src/common/debugger/signaldata/NFCompleteRep.cpp
  storage/ndb/src/common/debugger/signaldata/NdbSttor.cpp
  storage/ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp
  storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp
  storage/ndb/src/common/debugger/signaldata/PrepDropTab.cpp
  storage/ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp
  storage/ndb/src/common/debugger/signaldata/ScanFrag.cpp
  storage/ndb/src/common/debugger/signaldata/ScanTab.cpp
  storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp
  storage/ndb/src/common/debugger/signaldata/SignalDroppedRep.cpp
  storage/ndb/src/common/debugger/signaldata/SignalNames.cpp
  storage/ndb/src/common/debugger/signaldata/StartRec.cpp
  storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp
  storage/ndb/src/common/debugger/signaldata/SystemError.cpp
  storage/ndb/src/common/debugger/signaldata/TcIndx.cpp
  storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp
  storage/ndb/src/common/debugger/signaldata/TcKeyRef.cpp
  storage/ndb/src/common/debugger/signaldata/TcKeyReq.cpp
  storage/ndb/src/common/debugger/signaldata/TcRollbackRep.cpp
  storage/ndb/src/common/debugger/signaldata/TrigAttrInfo.cpp
  storage/ndb/src/common/debugger/signaldata/TupCommit.cpp
  storage/ndb/src/common/debugger/signaldata/TupKey.cpp
  storage/ndb/src/common/debugger/signaldata/TuxMaint.cpp
  storage/ndb/src/common/debugger/signaldata/UtilDelete.cpp
  storage/ndb/src/common/debugger/signaldata/UtilExecute.cpp
  storage/ndb/src/common/debugger/signaldata/UtilLock.cpp
  storage/ndb/src/common/debugger/signaldata/UtilPrepare.cpp
  storage/ndb/src/common/debugger/signaldata/UtilSequence.cpp
  storage/ndb/src/common/logger/ConsoleLogHandler.cpp
  storage/ndb/src/common/logger/FileLogHandler.cpp
  storage/ndb/src/common/logger/LogHandler.cpp
  storage/ndb/src/common/logger/LogHandlerList.cpp
  storage/ndb/src/common/logger/LogHandlerList.hpp
  storage/ndb/src/common/logger/Logger.cpp
  storage/ndb/src/common/logger/SysLogHandler.cpp
  storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp
  storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.hpp
  storage/ndb/src/common/logger/loggertest/LoggerUnitTest.cpp
  storage/ndb/src/common/logger/loggertest/LoggerUnitTest.hpp
  storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp
  storage/ndb/src/common/mgmcommon/IPCConfig.cpp
  storage/ndb/src/common/mgmcommon/printConfig/printConfig.cpp
  storage/ndb/src/common/portlib/NdbCondition.c
  storage/ndb/src/common/portlib/NdbConfig.c
  storage/ndb/src/common/portlib/NdbDaemon.c
  storage/ndb/src/common/portlib/NdbEnv.c
  storage/ndb/src/common/portlib/NdbHost.c
  storage/ndb/src/common/portlib/NdbMem.c
  storage/ndb/src/common/portlib/NdbMutex.c
  storage/ndb/src/common/portlib/NdbPortLibTest.cpp
  storage/ndb/src/common/portlib/NdbSleep.c
  storage/ndb/src/common/portlib/NdbTCP.cpp
  storage/ndb/src/common/portlib/NdbThread.c
  storage/ndb/src/common/portlib/NdbTick.c
  storage/ndb/src/common/portlib/memtest.c
  storage/ndb/src/common/portlib/mmstest.cpp
  storage/ndb/src/common/portlib/munmaptest.cpp
  storage/ndb/src/common/portlib/win32/NdbCondition.c
  storage/ndb/src/common/portlib/win32/NdbDaemon.c
  storage/ndb/src/common/portlib/win32/NdbEnv.c
  storage/ndb/src/common/portlib/win32/NdbHost.c
  storage/ndb/src/common/portlib/win32/NdbMem.c
  storage/ndb/src/common/portlib/win32/NdbMutex.c
  storage/ndb/src/common/portlib/win32/NdbSleep.c
  storage/ndb/src/common/portlib/win32/NdbTCP.c
  storage/ndb/src/common/portlib/win32/NdbThread.c
  storage/ndb/src/common/portlib/win32/NdbTick.c
  storage/ndb/src/common/transporter/Packer.cpp
  storage/ndb/src/common/transporter/Packer.hpp
  storage/ndb/src/common/transporter/SCI_Transporter.cpp
  storage/ndb/src/common/transporter/SCI_Transporter.hpp
  storage/ndb/src/common/transporter/SHM_Buffer.hpp
  storage/ndb/src/common/transporter/SHM_Transporter.cpp
  storage/ndb/src/common/transporter/SHM_Transporter.hpp
  storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp
  storage/ndb/src/common/transporter/SHM_Transporter.win32.cpp
  storage/ndb/src/common/transporter/SendBuffer.cpp
  storage/ndb/src/common/transporter/SendBuffer.hpp
  storage/ndb/src/common/transporter/TCP_Transporter.cpp
  storage/ndb/src/common/transporter/TCP_Transporter.hpp
  storage/ndb/src/common/transporter/Transporter.cpp
  storage/ndb/src/common/transporter/Transporter.hpp
  storage/ndb/src/common/transporter/TransporterInternalDefinitions.hpp
  storage/ndb/src/common/transporter/TransporterRegistry.cpp
  storage/ndb/src/common/transporter/basictest/basicTransporterTest.cpp
  storage/ndb/src/common/transporter/buddy.cpp
  storage/ndb/src/common/transporter/buddy.hpp
  storage/ndb/src/common/transporter/failoverSCI/failoverSCI.cpp
  storage/ndb/src/common/transporter/perftest/perfTransporterTest.cpp
  storage/ndb/src/common/transporter/priotest/prioSCI/prioSCI.cpp
  storage/ndb/src/common/transporter/priotest/prioSHM/prioSHM.cpp
  storage/ndb/src/common/transporter/priotest/prioTCP/prioTCP.cpp
  storage/ndb/src/common/transporter/priotest/prioTransporterTest.cpp
  storage/ndb/src/common/transporter/priotest/prioTransporterTest.hpp
  storage/ndb/src/common/util/BaseString.cpp
  storage/ndb/src/common/util/File.cpp
  storage/ndb/src/common/util/InputStream.cpp
  storage/ndb/src/common/util/NdbOut.cpp
  storage/ndb/src/common/util/NdbSqlUtil.cpp
  storage/ndb/src/common/util/OutputStream.cpp
  storage/ndb/src/common/util/Parser.cpp
  storage/ndb/src/common/util/Properties.cpp
  storage/ndb/src/common/util/SimpleProperties.cpp
  storage/ndb/src/common/util/SocketAuthenticator.cpp
  storage/ndb/src/common/util/SocketClient.cpp
  storage/ndb/src/common/util/SocketServer.cpp
  storage/ndb/src/common/util/basestring_vsnprintf.c
  storage/ndb/src/common/util/filetest/FileUnitTest.cpp
  storage/ndb/src/common/util/filetest/FileUnitTest.hpp
  storage/ndb/src/common/util/md5_hash.cpp
  storage/ndb/src/common/util/ndb_init.c
  storage/ndb/src/common/util/ndb_rand.c
  storage/ndb/src/common/util/random.c
  storage/ndb/src/common/util/socket_io.cpp
  storage/ndb/src/common/util/strdup.c
  storage/ndb/src/common/util/testProperties/testProperties.cpp
  storage/ndb/src/common/util/testSimpleProperties/sp_test.cpp
  storage/ndb/src/common/util/uucode.c
  storage/ndb/src/common/util/version.c
  storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.cpp
  storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.h
  storage/ndb/src/cw/cpcc-win32/C++/NdbControls.cpp
  storage/ndb/src/cw/cpcc-win32/C++/StdAfx.cpp
  storage/ndb/src/cw/cpcc-win32/C++/StdAfx.h
  storage/ndb/src/cw/cpcc-win32/C++/TreeView.cpp
  storage/ndb/src/cw/cpcc-win32/C++/TreeView.h
  storage/ndb/src/cw/cpcc-win32/C++/resource.h
  storage/ndb/src/cw/cpcc-win32/csharp/CPC_Form.cs
  storage/ndb/src/cw/cpcc-win32/csharp/Computer.cs
  storage/ndb/src/cw/cpcc-win32/csharp/ComputerAddDialog.cs
  storage/ndb/src/cw/cpcc-win32/csharp/ComputerRemoveDialog.cs
  storage/ndb/src/cw/cpcc-win32/csharp/Database.cs
  storage/ndb/src/cw/cpcc-win32/csharp/PanelWizard.cs
  storage/ndb/src/cw/cpcc-win32/csharp/Process.cs
  storage/ndb/src/cw/cpcc-win32/csharp/ProcessDefineDialog.cs
  storage/ndb/src/cw/cpcc-win32/csharp/fileaccess/FileMgmt.cs
  storage/ndb/src/cw/cpcc-win32/csharp/simpleparser/SimpleCPCParser.cs
  storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/SocketComm.cs
  storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/myTcpClient.cs
  storage/ndb/src/cw/cpcc-win32/csharp/startDatabaseDlg.cs
  storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs
  storage/ndb/src/cw/cpcd/APIService.cpp
  storage/ndb/src/cw/cpcd/APIService.hpp
  storage/ndb/src/cw/cpcd/CPCD.cpp
  storage/ndb/src/cw/cpcd/CPCD.hpp
  storage/ndb/src/cw/cpcd/Monitor.cpp
  storage/ndb/src/cw/cpcd/Process.cpp
  storage/ndb/src/cw/cpcd/common.cpp
  storage/ndb/src/cw/cpcd/common.hpp
  storage/ndb/src/cw/cpcd/main.cpp
  storage/ndb/src/cw/test/socketclient/socketClientTest.cpp
  storage/ndb/src/cw/util/ClientInterface.cpp
  storage/ndb/src/cw/util/ClientInterface.hpp
  storage/ndb/src/cw/util/SocketRegistry.cpp
  storage/ndb/src/cw/util/SocketRegistry.hpp
  storage/ndb/src/cw/util/SocketService.cpp
  storage/ndb/src/cw/util/SocketService.hpp
  storage/ndb/src/kernel/SimBlockList.cpp
  storage/ndb/src/kernel/blocks/backup/Backup.cpp
  storage/ndb/src/kernel/blocks/backup/Backup.hpp
  storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp
  storage/ndb/src/kernel/blocks/backup/BackupInit.cpp
  storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp
  storage/ndb/src/kernel/blocks/backup/read.cpp
  storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
  storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp
  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/SchemaFile.hpp
  storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp
  storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
  storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
  storage/ndb/src/kernel/blocks/dbdih/Sysfile.hpp
  storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp
  storage/ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp
  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/redoLogReader/reader.cpp
  storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp
  storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp
  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/AttributeOffset.hpp
  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
  storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp
  storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp
  storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
  storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp
  storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp
  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
  storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.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/DbtupPagMan.cpp
  storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp
  storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp
  storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp
  storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp
  storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
  storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp
  storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp
  storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.hpp
  storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp
  storage/ndb/src/kernel/blocks/dbtup/tuppage.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/DbtuxGen.cpp
  storage/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp
  storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp
  storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp
  storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp
  storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp
  storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp
  storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp
  storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp
  storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp
  storage/ndb/src/kernel/blocks/diskpage.hpp
  storage/ndb/src/kernel/blocks/lgman.hpp
  storage/ndb/src/kernel/blocks/mutexes.hpp
  storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp
  storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp
  storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
  storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp
  storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
  storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp
  storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp
  storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.cpp
  storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp
  storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp
  storage/ndb/src/kernel/blocks/ndbfs/Filename.hpp
  storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.cpp
  storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp
  storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/MemoryChannelTest.cpp
  storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
  storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp
  storage/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp
  storage/ndb/src/kernel/blocks/ndbfs/Pool.hpp
  storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp
  storage/ndb/src/kernel/blocks/pgman.cpp
  storage/ndb/src/kernel/blocks/pgman.hpp
  storage/ndb/src/kernel/blocks/print_file.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/qmgr/timer.hpp
  storage/ndb/src/kernel/blocks/record_types.hpp
  storage/ndb/src/kernel/blocks/restore.cpp
  storage/ndb/src/kernel/blocks/restore.hpp
  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/blocks/tsman.hpp
  storage/ndb/src/kernel/error/ErrorHandlingMacros.hpp
  storage/ndb/src/kernel/error/ErrorReporter.cpp
  storage/ndb/src/kernel/error/ErrorReporter.hpp
  storage/ndb/src/kernel/error/TimeModule.cpp
  storage/ndb/src/kernel/error/TimeModule.hpp
  storage/ndb/src/kernel/error/ndbd_exit_codes.c
  storage/ndb/src/kernel/main.cpp
  storage/ndb/src/kernel/vm/Array.hpp
  storage/ndb/src/kernel/vm/ArrayPool.hpp
  storage/ndb/src/kernel/vm/CArray.hpp
  storage/ndb/src/kernel/vm/Callback.hpp
  storage/ndb/src/kernel/vm/ClusterConfiguration.cpp
  storage/ndb/src/kernel/vm/ClusterConfiguration.hpp
  storage/ndb/src/kernel/vm/Configuration.cpp
  storage/ndb/src/kernel/vm/Configuration.hpp
  storage/ndb/src/kernel/vm/DLCFifoList.hpp
  storage/ndb/src/kernel/vm/DLCHashTable.hpp
  storage/ndb/src/kernel/vm/DLFifoList.hpp
  storage/ndb/src/kernel/vm/DLHashTable.hpp
  storage/ndb/src/kernel/vm/DLHashTable2.hpp
  storage/ndb/src/kernel/vm/DLList.hpp
  storage/ndb/src/kernel/vm/DataBuffer.hpp
  storage/ndb/src/kernel/vm/DynArr256.cpp
  storage/ndb/src/kernel/vm/DynArr256.hpp
  storage/ndb/src/kernel/vm/Emulator.cpp
  storage/ndb/src/kernel/vm/Emulator.hpp
  storage/ndb/src/kernel/vm/FastScheduler.cpp
  storage/ndb/src/kernel/vm/FastScheduler.hpp
  storage/ndb/src/kernel/vm/GlobalData.hpp
  storage/ndb/src/kernel/vm/KeyDescriptor.hpp
  storage/ndb/src/kernel/vm/KeyTable.hpp
  storage/ndb/src/kernel/vm/KeyTable2.hpp
  storage/ndb/src/kernel/vm/KeyTable2Ref.hpp
  storage/ndb/src/kernel/vm/LinearPool.hpp
  storage/ndb/src/kernel/vm/LongSignal.hpp
  storage/ndb/src/kernel/vm/Mutex.cpp
  storage/ndb/src/kernel/vm/Mutex.hpp
  storage/ndb/src/kernel/vm/NdbdSuperPool.cpp
  storage/ndb/src/kernel/vm/NdbdSuperPool.hpp
  storage/ndb/src/kernel/vm/Pool.cpp
  storage/ndb/src/kernel/vm/Pool.hpp
  storage/ndb/src/kernel/vm/Prio.hpp
  storage/ndb/src/kernel/vm/RWPool.cpp
  storage/ndb/src/kernel/vm/RWPool.hpp
  storage/ndb/src/kernel/vm/RequestTracker.hpp
  storage/ndb/src/kernel/vm/Rope.hpp
  storage/ndb/src/kernel/vm/SLFifoList.hpp
  storage/ndb/src/kernel/vm/SLList.hpp
  storage/ndb/src/kernel/vm/SafeCounter.cpp
  storage/ndb/src/kernel/vm/SafeCounter.hpp
  storage/ndb/src/kernel/vm/SectionReader.cpp
  storage/ndb/src/kernel/vm/SectionReader.hpp
  storage/ndb/src/kernel/vm/SignalCounter.hpp
  storage/ndb/src/kernel/vm/SimBlockList.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/SuperPool.cpp
  storage/ndb/src/kernel/vm/SuperPool.hpp
  storage/ndb/src/kernel/vm/ThreadConfig.cpp
  storage/ndb/src/kernel/vm/ThreadConfig.hpp
  storage/ndb/src/kernel/vm/TimeQueue.cpp
  storage/ndb/src/kernel/vm/TimeQueue.hpp
  storage/ndb/src/kernel/vm/TransporterCallback.cpp
  storage/ndb/src/kernel/vm/VMSignal.cpp
  storage/ndb/src/kernel/vm/VMSignal.hpp
  storage/ndb/src/kernel/vm/WOPool.cpp
  storage/ndb/src/kernel/vm/WOPool.hpp
  storage/ndb/src/kernel/vm/WaitQueue.hpp
  storage/ndb/src/kernel/vm/WatchDog.cpp
  storage/ndb/src/kernel/vm/WatchDog.hpp
  storage/ndb/src/kernel/vm/al_test/arrayListTest.cpp
  storage/ndb/src/kernel/vm/al_test/arrayPoolTest.cpp
  storage/ndb/src/kernel/vm/al_test/main.cpp
  storage/ndb/src/kernel/vm/bench_pool.cpp
  storage/ndb/src/kernel/vm/ndbd_malloc.cpp
  storage/ndb/src/kernel/vm/ndbd_malloc.hpp
  storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp
  storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp
  storage/ndb/src/kernel/vm/pc.hpp
  storage/ndb/src/kernel/vm/testCopy/rr.cpp
  storage/ndb/src/kernel/vm/testCopy/testCopy.cpp
  storage/ndb/src/kernel/vm/testDataBuffer/testDataBuffer.cpp
  storage/ndb/src/kernel/vm/testLongSig/testLongSig.cpp
  storage/ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp
  storage/ndb/src/kernel/vm/testSuperPool.cpp
  storage/ndb/src/mgmapi/LocalConfig.cpp
  storage/ndb/src/mgmapi/LocalConfig.hpp
  storage/ndb/src/mgmapi/mgmapi.cpp
  storage/ndb/src/mgmapi/mgmapi_configuration.hpp
  storage/ndb/src/mgmapi/mgmapi_internal.h
  storage/ndb/src/mgmapi/ndb_logevent.cpp
  storage/ndb/src/mgmapi/ndb_logevent.hpp
  storage/ndb/src/mgmapi/test/keso.c
  storage/ndb/src/mgmapi/test/mgmSrvApi.cpp
  storage/ndb/src/mgmclient/CommandInterpreter.cpp
  storage/ndb/src/mgmclient/main.cpp
  storage/ndb/src/mgmclient/ndb_mgmclient.h
  storage/ndb/src/mgmclient/ndb_mgmclient.hpp
  storage/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp
  storage/ndb/src/mgmsrv/Config.cpp
  storage/ndb/src/mgmsrv/Config.hpp
  storage/ndb/src/mgmsrv/ConfigInfo.cpp
  storage/ndb/src/mgmsrv/ConfigInfo.hpp
  storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
  storage/ndb/src/mgmsrv/InitConfigFileParser.hpp
  storage/ndb/src/mgmsrv/MgmtSrvr.cpp
  storage/ndb/src/mgmsrv/MgmtSrvr.hpp
  storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp
  storage/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp
  storage/ndb/src/mgmsrv/Services.cpp
  storage/ndb/src/mgmsrv/Services.hpp
  storage/ndb/src/mgmsrv/SignalQueue.cpp
  storage/ndb/src/mgmsrv/SignalQueue.hpp
  storage/ndb/src/mgmsrv/convertStrToInt.cpp
  storage/ndb/src/mgmsrv/convertStrToInt.hpp
  storage/ndb/src/mgmsrv/main.cpp
  storage/ndb/src/mgmsrv/mkconfig/mkconfig.cpp
  storage/ndb/src/ndbapi/API.hpp
  storage/ndb/src/ndbapi/ClusterMgr.cpp
  storage/ndb/src/ndbapi/ClusterMgr.hpp
  storage/ndb/src/ndbapi/DictCache.cpp
  storage/ndb/src/ndbapi/DictCache.hpp
  storage/ndb/src/ndbapi/Ndb.cpp
  storage/ndb/src/ndbapi/NdbApiSignal.cpp
  storage/ndb/src/ndbapi/NdbApiSignal.hpp
  storage/ndb/src/ndbapi/NdbBlob.cpp
  storage/ndb/src/ndbapi/NdbBlobImpl.hpp
  storage/ndb/src/ndbapi/NdbDictionary.cpp
  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
  storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
  storage/ndb/src/ndbapi/NdbErrorOut.cpp
  storage/ndb/src/ndbapi/NdbEventOperation.cpp
  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
  storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
  storage/ndb/src/ndbapi/NdbImpl.hpp
  storage/ndb/src/ndbapi/NdbIndexOperation.cpp
  storage/ndb/src/ndbapi/NdbIndexStat.cpp
  storage/ndb/src/ndbapi/NdbLinHash.hpp
  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/NdbOperationScan.cpp
  storage/ndb/src/ndbapi/NdbOperationSearch.cpp
  storage/ndb/src/ndbapi/NdbPool.cpp
  storage/ndb/src/ndbapi/NdbPoolImpl.cpp
  storage/ndb/src/ndbapi/NdbPoolImpl.hpp
  storage/ndb/src/ndbapi/NdbRecAttr.cpp
  storage/ndb/src/ndbapi/NdbReceiver.cpp
  storage/ndb/src/ndbapi/NdbScanFilter.cpp
  storage/ndb/src/ndbapi/NdbScanOperation.cpp
  storage/ndb/src/ndbapi/NdbTransaction.cpp
  storage/ndb/src/ndbapi/NdbTransactionScan.cpp
  storage/ndb/src/ndbapi/NdbUtil.cpp
  storage/ndb/src/ndbapi/NdbUtil.hpp
  storage/ndb/src/ndbapi/NdbWaiter.hpp
  storage/ndb/src/ndbapi/Ndberr.cpp
  storage/ndb/src/ndbapi/Ndbif.cpp
  storage/ndb/src/ndbapi/Ndbinit.cpp
  storage/ndb/src/ndbapi/Ndblist.cpp
  storage/ndb/src/ndbapi/ObjectMap.cpp
  storage/ndb/src/ndbapi/ObjectMap.hpp
  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/ndb_cluster_connection_impl.hpp
  storage/ndb/src/ndbapi/ndberror.c
  storage/ndb/src/ndbapi/signal-sender/SignalSender.cpp
  storage/ndb/src/ndbapi/signal-sender/SignalSender.hpp
  storage/ndb/test/include/AtrtClient.hpp
  storage/ndb/test/include/CpcClient.hpp
  storage/ndb/test/include/DbUtil.hpp
  storage/ndb/test/include/HugoAsynchTransactions.hpp
  storage/ndb/test/include/HugoCalculator.hpp
  storage/ndb/test/include/HugoOperations.hpp
  storage/ndb/test/include/HugoTransactions.hpp
  storage/ndb/test/include/NDBT.hpp
  storage/ndb/test/include/NDBT_DataSet.hpp
  storage/ndb/test/include/NDBT_DataSetTransaction.hpp
  storage/ndb/test/include/NDBT_Error.hpp
  storage/ndb/test/include/NDBT_Output.hpp
  storage/ndb/test/include/NDBT_ResultRow.hpp
  storage/ndb/test/include/NDBT_ReturnCodes.h
  storage/ndb/test/include/NDBT_Stats.hpp
  storage/ndb/test/include/NDBT_Table.hpp
  storage/ndb/test/include/NDBT_Tables.hpp
  storage/ndb/test/include/NDBT_Test.hpp
  storage/ndb/test/include/NDBT_Thread.hpp
  storage/ndb/test/include/NdbBackup.hpp
  storage/ndb/test/include/NdbConfig.hpp
  storage/ndb/test/include/NdbGrep.hpp
  storage/ndb/test/include/NdbMixRestarter.hpp
  storage/ndb/test/include/NdbRestarter.hpp
  storage/ndb/test/include/NdbRestarts.hpp
  storage/ndb/test/include/NdbSchemaCon.hpp
  storage/ndb/test/include/NdbSchemaOp.hpp
  storage/ndb/test/include/NdbTest.hpp
  storage/ndb/test/include/NdbTimer.hpp
  storage/ndb/test/include/TestNdbEventOperation.hpp
  storage/ndb/test/include/UtilTransactions.hpp
  storage/ndb/test/include/getarg.h
  storage/ndb/test/ndbapi/InsertRecs.cpp
  storage/ndb/test/ndbapi/ScanFilter.hpp
  storage/ndb/test/ndbapi/ScanFunctions.hpp
  storage/ndb/test/ndbapi/ScanInterpretTest.hpp
  storage/ndb/test/ndbapi/TraceNdbApi.cpp
  storage/ndb/test/ndbapi/VerifyNdbApi.cpp
  storage/ndb/test/ndbapi/acid.cpp
  storage/ndb/test/ndbapi/acid2.cpp
  storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp
  storage/ndb/test/ndbapi/adoInsertRecs.cpp
  storage/ndb/test/ndbapi/asyncGenerator.cpp
  storage/ndb/test/ndbapi/bank/Bank.cpp
  storage/ndb/test/ndbapi/bank/Bank.hpp
  storage/ndb/test/ndbapi/bank/BankLoad.cpp
  storage/ndb/test/ndbapi/bank/bankCreator.cpp
  storage/ndb/test/ndbapi/bank/bankMakeGL.cpp
  storage/ndb/test/ndbapi/bank/bankSumAccounts.cpp
  storage/ndb/test/ndbapi/bank/bankTimer.cpp
  storage/ndb/test/ndbapi/bank/bankTransactionMaker.cpp
  storage/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp
  storage/ndb/test/ndbapi/bank/testBank.cpp
  storage/ndb/test/ndbapi/bench/asyncGenerator.cpp
  storage/ndb/test/ndbapi/bench/dbGenerator.h
  storage/ndb/test/ndbapi/bench/dbPopulate.cpp
  storage/ndb/test/ndbapi/bench/dbPopulate.h
  storage/ndb/test/ndbapi/bench/macros.h
  storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp
  storage/ndb/test/ndbapi/bench/mainPopulate.cpp
  storage/ndb/test/ndbapi/bench/ndb_async1.cpp
  storage/ndb/test/ndbapi/bench/ndb_async2.cpp
  storage/ndb/test/ndbapi/bench/ndb_error.hpp
  storage/ndb/test/ndbapi/bench/ndb_schema.hpp
  storage/ndb/test/ndbapi/bench/ndb_user_transaction.cpp
  storage/ndb/test/ndbapi/bench/ndb_user_transaction2.cpp
  storage/ndb/test/ndbapi/bench/ndb_user_transaction3.cpp
  storage/ndb/test/ndbapi/bench/ndb_user_transaction4.cpp
  storage/ndb/test/ndbapi/bench/ndb_user_transaction5.cpp
  storage/ndb/test/ndbapi/bench/ndb_user_transaction6.cpp
  storage/ndb/test/ndbapi/bench/testData.h
  storage/ndb/test/ndbapi/bench/testDefinitions.h
  storage/ndb/test/ndbapi/bench/userInterface.cpp
  storage/ndb/test/ndbapi/bench/userInterface.h
  storage/ndb/test/ndbapi/benchronja.cpp
  storage/ndb/test/ndbapi/bulk_copy.cpp
  storage/ndb/test/ndbapi/cdrserver.cpp
  storage/ndb/test/ndbapi/celloDb.cpp
  storage/ndb/test/ndbapi/create_all_tabs.cpp
  storage/ndb/test/ndbapi/create_tab.cpp
  storage/ndb/test/ndbapi/drop_all_tabs.cpp
  storage/ndb/test/ndbapi/flexAsynch.cpp
  storage/ndb/test/ndbapi/flexBench.cpp
  storage/ndb/test/ndbapi/flexHammer.cpp
  storage/ndb/test/ndbapi/flexScan.cpp
  storage/ndb/test/ndbapi/flexTT.cpp
  storage/ndb/test/ndbapi/flexTimedAsynch.cpp
  storage/ndb/test/ndbapi/flex_bench_mysql.cpp
  storage/ndb/test/ndbapi/index.cpp
  storage/ndb/test/ndbapi/index2.cpp
  storage/ndb/test/ndbapi/initronja.cpp
  storage/ndb/test/ndbapi/interpreterInTup.cpp
  storage/ndb/test/ndbapi/mainAsyncGenerator.cpp
  storage/ndb/test/ndbapi/msa.cpp
  storage/ndb/test/ndbapi/ndb_async1.cpp
  storage/ndb/test/ndbapi/ndb_async2.cpp
  storage/ndb/test/ndbapi/ndb_user_populate.cpp
  storage/ndb/test/ndbapi/ndb_user_transaction.cpp
  storage/ndb/test/ndbapi/ndb_user_transaction2.cpp
  storage/ndb/test/ndbapi/ndb_user_transaction3.cpp
  storage/ndb/test/ndbapi/ndb_user_transaction4.cpp
  storage/ndb/test/ndbapi/ndb_user_transaction5.cpp
  storage/ndb/test/ndbapi/ndb_user_transaction6.cpp
  storage/ndb/test/ndbapi/restarter.cpp
  storage/ndb/test/ndbapi/restarter2.cpp
  storage/ndb/test/ndbapi/restarts.cpp
  storage/ndb/test/ndbapi/size.cpp
  storage/ndb/test/ndbapi/testBackup.cpp
  storage/ndb/test/ndbapi/testBasic.cpp
  storage/ndb/test/ndbapi/testBasicAsynch.cpp
  storage/ndb/test/ndbapi/testBlobs.cpp
  storage/ndb/test/ndbapi/testDataBuffers.cpp
  storage/ndb/test/ndbapi/testDeadlock.cpp
  storage/ndb/test/ndbapi/testDict.cpp
  storage/ndb/test/ndbapi/testGrepVerify.cpp
  storage/ndb/test/ndbapi/testIndex.cpp
  storage/ndb/test/ndbapi/testIndexStat.cpp
  storage/ndb/test/ndbapi/testInterpreter.cpp
  storage/ndb/test/ndbapi/testMgm.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/testOrderedIndex.cpp
  storage/ndb/test/ndbapi/testPartitioning.cpp
  storage/ndb/test/ndbapi/testReadPerf.cpp
  storage/ndb/test/ndbapi/testRestartGci.cpp
  storage/ndb/test/ndbapi/testSRBank.cpp
  storage/ndb/test/ndbapi/testScan.cpp
  storage/ndb/test/ndbapi/testScanInterpreter.cpp
  storage/ndb/test/ndbapi/testScanPerf.cpp
  storage/ndb/test/ndbapi/testSystemRestart.cpp
  storage/ndb/test/ndbapi/testTimeout.cpp
  storage/ndb/test/ndbapi/testTransactions.cpp
  storage/ndb/test/ndbapi/test_event.cpp
  storage/ndb/test/ndbapi/test_event_merge.cpp
  storage/ndb/test/ndbapi/test_event_multi_table.cpp
  storage/ndb/test/ndbapi/userInterface.cpp
  storage/ndb/test/ndbnet/test.run
  storage/ndb/test/ndbnet/testError.run
  storage/ndb/test/ndbnet/testMNF.run
  storage/ndb/test/ndbnet/testNR.run
  storage/ndb/test/ndbnet/testNR1.run
  storage/ndb/test/ndbnet/testNR4.run
  storage/ndb/test/ndbnet/testSRhang.run
  storage/ndb/test/ndbnet/testTR295.run
  storage/ndb/test/newtonapi/basic_test/basic/basic.cpp
  storage/ndb/test/newtonapi/basic_test/bulk_read/br_test.cpp
  storage/ndb/test/newtonapi/basic_test/common.cpp
  storage/ndb/test/newtonapi/basic_test/common.hpp
  storage/ndb/test/newtonapi/basic_test/ptr_binding/ptr_binding_test.cpp
  storage/ndb/test/newtonapi/basic_test/too_basic.cpp
  storage/ndb/test/newtonapi/perf_test/perf.cpp
  storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp
  storage/ndb/test/odbc/SQL99_test/SQL99_test.h
  storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp
  storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp
  storage/ndb/test/odbc/client/NDBT_SQLConnect.cpp
  storage/ndb/test/odbc/client/NDBT_SQLPrepare.cpp
  storage/ndb/test/odbc/client/SQLAllocEnvTest.cpp
  storage/ndb/test/odbc/client/SQLAllocHandleTest.cpp
  storage/ndb/test/odbc/client/SQLAllocHandleTest_bf.cpp
  storage/ndb/test/odbc/client/SQLBindColTest.cpp
  storage/ndb/test/odbc/client/SQLBindParameterTest.cpp
  storage/ndb/test/odbc/client/SQLCancelTest.cpp
  storage/ndb/test/odbc/client/SQLCloseCursorTest.cpp
  storage/ndb/test/odbc/client/SQLColAttributeTest.cpp
  storage/ndb/test/odbc/client/SQLColAttributeTest1.cpp
  storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp
  storage/ndb/test/odbc/client/SQLColAttributeTest3.cpp
  storage/ndb/test/odbc/client/SQLConnectTest.cpp
  storage/ndb/test/odbc/client/SQLCopyDescTest.cpp
  storage/ndb/test/odbc/client/SQLDescribeColTest.cpp
  storage/ndb/test/odbc/client/SQLDisconnectTest.cpp
  storage/ndb/test/odbc/client/SQLDriverConnectTest.cpp
  storage/ndb/test/odbc/client/SQLEndTranTest.cpp
  storage/ndb/test/odbc/client/SQLErrorTest.cpp
  storage/ndb/test/odbc/client/SQLExecDirectTest.cpp
  storage/ndb/test/odbc/client/SQLExecuteTest.cpp
  storage/ndb/test/odbc/client/SQLFetchScrollTest.cpp
  storage/ndb/test/odbc/client/SQLFetchTest.cpp
  storage/ndb/test/odbc/client/SQLFreeHandleTest.cpp
  storage/ndb/test/odbc/client/SQLFreeStmtTest.cpp
  storage/ndb/test/odbc/client/SQLGetConnectAttrTest.cpp
  storage/ndb/test/odbc/client/SQLGetCursorNameTest.cpp
  storage/ndb/test/odbc/client/SQLGetDataTest.cpp
  storage/ndb/test/odbc/client/SQLGetDescFieldTest.cpp
  storage/ndb/test/odbc/client/SQLGetDescRecTest.cpp
  storage/ndb/test/odbc/client/SQLGetDiagFieldTest.cpp
  storage/ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp
  storage/ndb/test/odbc/client/SQLGetDiagRecTest.cpp
  storage/ndb/test/odbc/client/SQLGetEnvAttrTest.cpp
  storage/ndb/test/odbc/client/SQLGetFunctionsTest.cpp
  storage/ndb/test/odbc/client/SQLGetInfoTest.cpp
  storage/ndb/test/odbc/client/SQLGetStmtAttrTest.cpp
  storage/ndb/test/odbc/client/SQLGetTypeInfoTest.cpp
  storage/ndb/test/odbc/client/SQLMoreResultsTest.cpp
  storage/ndb/test/odbc/client/SQLNumResultColsTest.cpp
  storage/ndb/test/odbc/client/SQLParamDataTest.cpp
  storage/ndb/test/odbc/client/SQLPrepareTest.cpp
  storage/ndb/test/odbc/client/SQLPutDataTest.cpp
  storage/ndb/test/odbc/client/SQLRowCountTest.cpp
  storage/ndb/test/odbc/client/SQLSetConnectAttrTest.cpp
  storage/ndb/test/odbc/client/SQLSetCursorNameTest.cpp
  storage/ndb/test/odbc/client/SQLSetDescFieldTest.cpp
  storage/ndb/test/odbc/client/SQLSetDescRecTest.cpp
  storage/ndb/test/odbc/client/SQLSetEnvAttrTest.cpp
  storage/ndb/test/odbc/client/SQLSetStmtAttrTest.cpp
  storage/ndb/test/odbc/client/SQLTablesTest.cpp
  storage/ndb/test/odbc/client/SQLTransactTest.cpp
  storage/ndb/test/odbc/client/common.hpp
  storage/ndb/test/odbc/client/main.cpp
  storage/ndb/test/odbc/driver/testOdbcDriver.cpp
  storage/ndb/test/odbc/test_compiler/test_compiler.cpp
  storage/ndb/test/run-test/atrt-analyze-result.sh
  storage/ndb/test/run-test/atrt-clear-result.sh
  storage/ndb/test/run-test/atrt-gather-result.sh
  storage/ndb/test/run-test/atrt-setup.sh
  storage/ndb/test/run-test/atrt-testBackup
  storage/ndb/test/run-test/atrt.hpp
  storage/ndb/test/run-test/main.cpp
  storage/ndb/test/run-test/make-index.sh
  storage/ndb/test/src/CpcClient.cpp
  storage/ndb/test/src/DbUtil.cpp
  storage/ndb/test/src/HugoAsynchTransactions.cpp
  storage/ndb/test/src/HugoCalculator.cpp
  storage/ndb/test/src/HugoOperations.cpp
  storage/ndb/test/src/HugoTransactions.cpp
  storage/ndb/test/src/NDBT_Error.cpp
  storage/ndb/test/src/NDBT_Output.cpp
  storage/ndb/test/src/NDBT_ResultRow.cpp
  storage/ndb/test/src/NDBT_ReturnCodes.cpp
  storage/ndb/test/src/NDBT_Table.cpp
  storage/ndb/test/src/NDBT_Tables.cpp
  storage/ndb/test/src/NDBT_Test.cpp
  storage/ndb/test/src/NDBT_Thread.cpp
  storage/ndb/test/src/NdbBackup.cpp
  storage/ndb/test/src/NdbConfig.cpp
  storage/ndb/test/src/NdbGrep.cpp
  storage/ndb/test/src/NdbMixRestarter.cpp
  storage/ndb/test/src/NdbRestarter.cpp
  storage/ndb/test/src/NdbRestarts.cpp
  storage/ndb/test/src/NdbSchemaCon.cpp
  storage/ndb/test/src/NdbSchemaOp.cpp
  storage/ndb/test/src/UtilTransactions.cpp
  storage/ndb/test/tools/connect.cpp
  storage/ndb/test/tools/copy_tab.cpp
  storage/ndb/test/tools/cpcc.cpp
  storage/ndb/test/tools/create_index.cpp
  storage/ndb/test/tools/hugoCalculator.cpp
  storage/ndb/test/tools/hugoFill.cpp
  storage/ndb/test/tools/hugoLoad.cpp
  storage/ndb/test/tools/hugoLockRecords.cpp
  storage/ndb/test/tools/hugoPkDelete.cpp
  storage/ndb/test/tools/hugoPkRead.cpp
  storage/ndb/test/tools/hugoPkReadRecord.cpp
  storage/ndb/test/tools/hugoPkUpdate.cpp
  storage/ndb/test/tools/hugoScanRead.cpp
  storage/ndb/test/tools/hugoScanUpdate.cpp
  storage/ndb/test/tools/listen.cpp
  storage/ndb/test/tools/rep_latency.cpp
  storage/ndb/test/tools/restart.cpp
  storage/ndb/test/tools/transproxy.cpp
  storage/ndb/test/tools/verify_index.cpp
  storage/ndb/tools/clean-links.sh
  storage/ndb/tools/delete_all.cpp
  storage/ndb/tools/desc.cpp
  storage/ndb/tools/drop_index.cpp
  storage/ndb/tools/drop_tab.cpp
  storage/ndb/tools/listTables.cpp
  storage/ndb/tools/make-errors.pl
  storage/ndb/tools/make-links.sh
  storage/ndb/tools/ndb_config.cpp
  storage/ndb/tools/ndb_error_reporter
  storage/ndb/tools/ndb_test_platform.cpp
  storage/ndb/tools/ndbsql.cpp
  storage/ndb/tools/restore/Restore.cpp
  storage/ndb/tools/restore/Restore.hpp
  storage/ndb/tools/restore/consumer.cpp
  storage/ndb/tools/restore/consumer.hpp
  storage/ndb/tools/restore/consumer_printer.cpp
  storage/ndb/tools/restore/consumer_printer.hpp
  storage/ndb/tools/restore/consumer_restore.cpp
  storage/ndb/tools/restore/consumer_restore.hpp
  storage/ndb/tools/restore/consumer_restorem.cpp
  storage/ndb/tools/restore/ndb_nodegroup_map.h
  storage/ndb/tools/restore/restore_main.cpp
  storage/ndb/tools/rgrep
  storage/ndb/tools/select_all.cpp
  storage/ndb/tools/select_count.cpp
  storage/ndb/tools/waiter.cpp
  storage/oqgraph/CMakeLists.txt
  storage/oqgraph/ha_oqgraph.cc
  storage/oqgraph/ha_oqgraph.h
  storage/oqgraph/mysql-test/oqgraph/boundary_conditions.result
  storage/oqgraph/mysql-test/oqgraph/boundary_conditions.test
  storage/oqgraph/mysql-test/oqgraph/invalid_operations.result
  storage/oqgraph/mysql-test/oqgraph/invalid_operations.test
  storage/oqgraph/mysql-test/oqgraph/isnull.result
  storage/oqgraph/mysql-test/oqgraph/isnull.test
  storage/oqgraph/mysql-test/oqgraph/regression_1233113.result
  storage/oqgraph/mysql-test/oqgraph/regression_1233113.test
  storage/oqgraph/mysql-test/oqgraph/regression_drop_after.result
  storage/oqgraph/mysql-test/oqgraph/regression_drop_after.test
  storage/oqgraph/mysql-test/oqgraph/suite.pm
  storage/perfschema/CMakeLists.txt
  storage/perfschema/pfs_check.cc
  storage/perfschema/pfs_events_waits.cc
  storage/perfschema/pfs_global.cc
  storage/perfschema/table_events_waits.cc
  storage/perfschema/unittest/CMakeLists.txt
  storage/sequence/mysql-test/sequence/simple.result
  storage/sequence/mysql-test/sequence/simple.test
  storage/sequence/sequence.cc
  storage/sphinx/ha_sphinx.cc
  storage/sphinx/mysql-test/sphinx/suite.pm
  storage/spider/ha_spider.cc
  storage/spider/ha_spider.h
  storage/spider/mysql-test/spider/bg/suite.opt
  storage/spider/scripts/install_spider.sql
  storage/spider/spd_conn.cc
  storage/spider/spd_conn.h
  storage/spider/spd_copy_tables.cc
  storage/spider/spd_copy_tables.h
  storage/spider/spd_db_conn.cc
  storage/spider/spd_db_conn.h
  storage/spider/spd_db_handlersocket.cc
  storage/spider/spd_db_handlersocket.h
  storage/spider/spd_db_include.h
  storage/spider/spd_db_mysql.cc
  storage/spider/spd_db_mysql.h
  storage/spider/spd_db_oracle.cc
  storage/spider/spd_db_oracle.h
  storage/spider/spd_direct_sql.cc
  storage/spider/spd_direct_sql.h
  storage/spider/spd_err.h
  storage/spider/spd_i_s.cc
  storage/spider/spd_include.h
  storage/spider/spd_malloc.cc
  storage/spider/spd_malloc.h
  storage/spider/spd_param.cc
  storage/spider/spd_param.h
  storage/spider/spd_ping_table.cc
  storage/spider/spd_ping_table.h
  storage/spider/spd_sys_table.cc
  storage/spider/spd_sys_table.h
  storage/spider/spd_table.cc
  storage/spider/spd_table.h
  storage/spider/spd_trx.cc
  storage/spider/spd_trx.h
  storage/spider/spd_udf.cc
  storage/spider/spd_udf.h
  storage/tokudb/CMakeLists.txt
  storage/tokudb/README.md
  storage/tokudb/ft-index/CMakeLists.txt
  storage/tokudb/ft-index/README.md
  storage/tokudb/ft-index/buildheader/CMakeLists.txt
  storage/tokudb/ft-index/buildheader/make_tdb.cc
  storage/tokudb/ft-index/cmake_modules/TokuSetupCTest.cmake
  storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake
  storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake
  storage/tokudb/ft-index/examples/CMakeLists.txt
  storage/tokudb/ft-index/ft/CMakeLists.txt
  storage/tokudb/ft-index/ft/bndata.cc
  storage/tokudb/ft-index/ft/bndata.h
  storage/tokudb/ft-index/ft/cachetable-internal.h
  storage/tokudb/ft-index/ft/cachetable.cc
  storage/tokudb/ft-index/ft/cachetable.h
  storage/tokudb/ft-index/ft/checkpoint.cc
  storage/tokudb/ft-index/ft/compress.cc
  storage/tokudb/ft-index/ft/fifo.cc
  storage/tokudb/ft-index/ft/fifo.h
  storage/tokudb/ft-index/ft/ft-cachetable-wrappers.cc
  storage/tokudb/ft-index/ft/ft-flusher.cc
  storage/tokudb/ft-index/ft/ft-flusher.h
  storage/tokudb/ft-index/ft/ft-hot-flusher.cc
  storage/tokudb/ft-index/ft/ft-internal.h
  storage/tokudb/ft-index/ft/ft-ops.cc
  storage/tokudb/ft-index/ft/ft-ops.h
  storage/tokudb/ft-index/ft/ft-serialize.cc
  storage/tokudb/ft-index/ft/ft-test-helpers.cc
  storage/tokudb/ft-index/ft/ft.cc
  storage/tokudb/ft-index/ft/ft.h
  storage/tokudb/ft-index/ft/ft_layout_version.h
  storage/tokudb/ft-index/ft/ft_node-serialize.cc
  storage/tokudb/ft-index/ft/ftloader-internal.h
  storage/tokudb/ft-index/ft/ftloader.cc
  storage/tokudb/ft-index/ft/fttypes.h
  storage/tokudb/ft-index/ft/leafentry.h
  storage/tokudb/ft-index/ft/log-internal.h
  storage/tokudb/ft-index/ft/logformat.cc
  storage/tokudb/ft-index/ft/logger.cc
  storage/tokudb/ft-index/ft/logger.h
  storage/tokudb/ft-index/ft/roll.cc
  storage/tokudb/ft-index/ft/rollback-apply.cc
  storage/tokudb/ft-index/ft/rollback-ct-callbacks.cc
  storage/tokudb/ft-index/ft/rollback-ct-callbacks.h
  storage/tokudb/ft-index/ft/rollback.cc
  storage/tokudb/ft-index/ft/rollback.h
  storage/tokudb/ft-index/ft/rollback_log_node_cache.cc
  storage/tokudb/ft-index/ft/rollback_log_node_cache.h
  storage/tokudb/ft-index/ft/tests/cachetable-5097.cc
  storage/tokudb/ft-index/ft/tests/cachetable-5978.cc
  storage/tokudb/ft-index/ft/tests/cachetable-clock-eviction2.cc
  storage/tokudb/ft-index/ft/tests/cachetable-clock-eviction3.cc
  storage/tokudb/ft-index/ft/tests/cachetable-clock-eviction4.cc
  storage/tokudb/ft-index/ft/tests/cachetable-eviction-close-test2.cc
  storage/tokudb/ft-index/ft/tests/cachetable-eviction-getandpin-test2.cc
  storage/tokudb/ft-index/ft/tests/cachetable-evictor-class.cc
  storage/tokudb/ft-index/ft/tests/ft-bfe-query.cc
  storage/tokudb/ft-index/ft/tests/ft-clock-test.cc
  storage/tokudb/ft-index/ft/tests/ft-serialize-benchmark.cc
  storage/tokudb/ft-index/ft/tests/ft-serialize-test.cc
  storage/tokudb/ft-index/ft/tests/ftloader-test-bad-generate.cc
  storage/tokudb/ft-index/ft/tests/ftloader-test-extractor-errors.cc
  storage/tokudb/ft-index/ft/tests/ftloader-test-extractor.cc
  storage/tokudb/ft-index/ft/tests/ftloader-test-merge-files-dbufio.cc
  storage/tokudb/ft-index/ft/tests/ftloader-test-open.cc
  storage/tokudb/ft-index/ft/tests/ftloader-test-writer-errors.cc
  storage/tokudb/ft-index/ft/tests/ftloader-test-writer.cc
  storage/tokudb/ft-index/ft/tests/ftloader-test.cc
  storage/tokudb/ft-index/ft/tests/make-tree.cc
  storage/tokudb/ft-index/ft/tests/msnfilter.cc
  storage/tokudb/ft-index/ft/tests/orthopush-flush.cc
  storage/tokudb/ft-index/ft/tests/test-flushes-on-cleaner.cc
  storage/tokudb/ft-index/ft/tests/test-hot-with-bounds.cc
  storage/tokudb/ft-index/ft/tests/test-inc-split.cc
  storage/tokudb/ft-index/ft/tests/test-leafentry-nested.cc
  storage/tokudb/ft-index/ft/tests/test-pick-child-to-flush.cc
  storage/tokudb/ft-index/ft/tests/test.h
  storage/tokudb/ft-index/ft/tests/upgrade_test_simple.cc
  storage/tokudb/ft-index/ft/tests/verify-bad-msn.cc
  storage/tokudb/ft-index/ft/tests/verify-bad-pivots.cc
  storage/tokudb/ft-index/ft/tests/verify-dup-in-leaf.cc
  storage/tokudb/ft-index/ft/tests/verify-dup-pivots.cc
  storage/tokudb/ft-index/ft/tests/verify-misrouted-msgs.cc
  storage/tokudb/ft-index/ft/tests/verify-unsorted-leaf.cc
  storage/tokudb/ft-index/ft/tests/verify-unsorted-pivots.cc
  storage/tokudb/ft-index/ft/txn.cc
  storage/tokudb/ft-index/ft/txn_manager.cc
  storage/tokudb/ft-index/ft/txn_manager.h
  storage/tokudb/ft-index/ft/ule.cc
  storage/tokudb/ft-index/ft/ule.h
  storage/tokudb/ft-index/locktree/lock_request.cc
  storage/tokudb/ft-index/locktree/lock_request.h
  storage/tokudb/ft-index/locktree/locktree.cc
  storage/tokudb/ft-index/locktree/locktree.h
  storage/tokudb/ft-index/locktree/manager.cc
  storage/tokudb/ft-index/locktree/tests/lock_request_create_set.cc
  storage/tokudb/ft-index/locktree/tests/lock_request_get_set_keys.cc
  storage/tokudb/ft-index/locktree/tests/lock_request_start_deadlock.cc
  storage/tokudb/ft-index/locktree/tests/lock_request_start_pending.cc
  storage/tokudb/ft-index/locktree/tests/lock_request_unit_test.h
  storage/tokudb/ft-index/locktree/tests/locktree_conflicts.cc
  storage/tokudb/ft-index/locktree/tests/locktree_escalation_stalls.cc
  storage/tokudb/ft-index/locktree/tests/locktree_infinity.cc
  storage/tokudb/ft-index/locktree/tests/locktree_overlapping_relock.cc
  storage/tokudb/ft-index/locktree/tests/locktree_simple_lock.cc
  storage/tokudb/ft-index/locktree/tests/locktree_single_txnid_optimization.cc
  storage/tokudb/ft-index/locktree/tests/manager_create_destroy.cc
  storage/tokudb/ft-index/locktree/tests/manager_params.cc
  storage/tokudb/ft-index/locktree/tests/manager_status.cc
  storage/tokudb/ft-index/portability/CMakeLists.txt
  storage/tokudb/ft-index/portability/file.cc
  storage/tokudb/ft-index/portability/os_malloc.cc
  storage/tokudb/ft-index/scripts/run.stress-tests.py
  storage/tokudb/ft-index/src/CMakeLists.txt
  storage/tokudb/ft-index/src/export.map
  storage/tokudb/ft-index/src/indexer-undo-do.cc
  storage/tokudb/ft-index/src/loader.cc
  storage/tokudb/ft-index/src/tests/CMakeLists.txt
  storage/tokudb/ft-index/src/tests/blocking-first-empty.cc
  storage/tokudb/ft-index/src/tests/blocking-first.cc
  storage/tokudb/ft-index/src/tests/blocking-last.cc
  storage/tokudb/ft-index/src/tests/blocking-next-prev-deadlock.cc
  storage/tokudb/ft-index/src/tests/blocking-prelock-range.cc
  storage/tokudb/ft-index/src/tests/blocking-put-timeout.cc
  storage/tokudb/ft-index/src/tests/blocking-put-wakeup.cc
  storage/tokudb/ft-index/src/tests/blocking-put.cc
  storage/tokudb/ft-index/src/tests/blocking-set-range-0.cc
  storage/tokudb/ft-index/src/tests/blocking-set-range-n.cc
  storage/tokudb/ft-index/src/tests/blocking-set-range-reverse-0.cc
  storage/tokudb/ft-index/src/tests/blocking-set.cc
  storage/tokudb/ft-index/src/tests/blocking-table-lock.cc
  storage/tokudb/ft-index/src/tests/db-put-simple-deadlock-threads.cc
  storage/tokudb/ft-index/src/tests/db-put-simple-lockwait.cc
  storage/tokudb/ft-index/src/tests/db-put-update-deadlock.cc
  storage/tokudb/ft-index/src/tests/env_loader_memory.cc
  storage/tokudb/ft-index/src/tests/filesize.cc
  storage/tokudb/ft-index/src/tests/hot-optimize-table-tests.cc
  storage/tokudb/ft-index/src/tests/test_4368.cc
  storage/tokudb/ft-index/src/tests/test_iterate_pending_lock_requests.cc
  storage/tokudb/ft-index/src/tests/test_kv_gen.h
  storage/tokudb/ft-index/src/tests/test_lock_timeout_callback.cc
  storage/tokudb/ft-index/src/tests/test_stress5.cc
  storage/tokudb/ft-index/src/tests/threaded_stress_test_helpers.h
  storage/tokudb/ft-index/src/tests/update-multiple-with-indexer-array.cc
  storage/tokudb/ft-index/src/ydb-internal.h
  storage/tokudb/ft-index/src/ydb.cc
  storage/tokudb/ft-index/src/ydb_cursor.cc
  storage/tokudb/ft-index/src/ydb_db.cc
  storage/tokudb/ft-index/src/ydb_env_func.cc
  storage/tokudb/ft-index/src/ydb_row_lock.cc
  storage/tokudb/ft-index/src/ydb_txn.cc
  storage/tokudb/ft-index/src/ydb_txn.h
  storage/tokudb/ft-index/toku_include/CMakeLists.txt
  storage/tokudb/ft-index/util/CMakeLists.txt
  storage/tokudb/ft-index/util/frwlock.cc
  storage/tokudb/ft-index/util/frwlock.h
  storage/tokudb/ft-index/util/kibbutz.cc
  storage/tokudb/ft-index/util/kibbutz.h
  storage/tokudb/ft-index/util/mempool.cc
  storage/tokudb/ft-index/util/mempool.h
  storage/tokudb/ft-index/util/tests/test-kibbutz.cc
  storage/tokudb/ft-index/util/tests/test-kibbutz2.cc
  storage/tokudb/ft-index/util/tests/test-rwlock-cheapness.cc
  storage/tokudb/ft-index/util/tests/test-rwlock.cc
  storage/tokudb/ha_tokudb.cc
  storage/tokudb/ha_tokudb.h
  storage/tokudb/ha_tokudb_admin.cc
  storage/tokudb/ha_tokudb_alter_56.cc
  storage/tokudb/ha_tokudb_alter_common.cc
  storage/tokudb/ha_tokudb_update.cc
  storage/tokudb/hatoku_cmp.cc
  storage/tokudb/hatoku_cmp.h
  storage/tokudb/hatoku_defines.h
  storage/tokudb/hatoku_hton.cc
  storage/tokudb/hatoku_hton.h
  storage/tokudb/mysql-test/tokudb/locks-blocking-row-locks-testgen.py
  storage/tokudb/mysql-test/tokudb/r/auto_increment.result
  storage/tokudb/mysql-test/tokudb/r/auto_increment_boundary.result
  storage/tokudb/mysql-test/tokudb/r/auto_increment_boundary_traditional.result
  storage/tokudb/mysql-test/tokudb/r/change_column_char_default.result
  storage/tokudb/mysql-test/tokudb/r/change_column_int_default.result
  storage/tokudb/mysql-test/tokudb/r/change_column_varbin.result
  storage/tokudb/mysql-test/tokudb/r/change_column_varbin_default.result
  storage/tokudb/mysql-test/tokudb/r/change_column_varbin_multiple.result
  storage/tokudb/mysql-test/tokudb/r/change_column_varchar.result
  storage/tokudb/mysql-test/tokudb/r/change_column_varchar_default.result
  storage/tokudb/mysql-test/tokudb/r/change_column_varchar_prefix_a.result
  storage/tokudb/mysql-test/tokudb/r/change_column_varchar_prefix_b.result
  storage/tokudb/mysql-test/tokudb/r/change_column_varchar_sum_cross256.result
  storage/tokudb/mysql-test/tokudb/r/cluster_2968-0.result
  storage/tokudb/mysql-test/tokudb/r/cluster_2968-1.result
  storage/tokudb/mysql-test/tokudb/r/cluster_2968-2.result
  storage/tokudb/mysql-test/tokudb/r/cluster_2968-3.result
  storage/tokudb/mysql-test/tokudb/r/cluster_create_table.result
  storage/tokudb/mysql-test/tokudb/r/cluster_filter_unpack_varchar_and_int_hidden.result
  storage/tokudb/mysql-test/tokudb/r/ctype_collate.result
  storage/tokudb/mysql-test/tokudb/r/ctype_cp1250_ch.result
  storage/tokudb/mysql-test/tokudb/r/hotindex-del-fast.result
  storage/tokudb/mysql-test/tokudb/r/hotindex-del-slow.result
  storage/tokudb/mysql-test/tokudb/r/information-schema-global-status.result
  storage/tokudb/mysql-test/tokudb/r/locks-blocking-row-locks-getset.result
  storage/tokudb/mysql-test/tokudb/r/locks-blocking-row-locks.result
  storage/tokudb/mysql-test/tokudb/r/mvcc-10.result
  storage/tokudb/mysql-test/tokudb/r/mvcc-11.result
  storage/tokudb/mysql-test/tokudb/r/mvcc-12.result
  storage/tokudb/mysql-test/tokudb/r/mvcc-13.result
  storage/tokudb/mysql-test/tokudb/r/mvcc-14.result
  storage/tokudb/mysql-test/tokudb/r/mvcc-15.result
  storage/tokudb/mysql-test/tokudb/r/mvcc-16.result
  storage/tokudb/mysql-test/tokudb/r/mvcc-17.result
  storage/tokudb/mysql-test/tokudb/r/mvcc-18.result
  storage/tokudb/mysql-test/tokudb/r/mvcc-21.result
  storage/tokudb/mysql-test/tokudb/r/mvcc-22.result
  storage/tokudb/mysql-test/tokudb/r/mvcc-23.result
  storage/tokudb/mysql-test/tokudb/r/mvcc-25.result
  storage/tokudb/mysql-test/tokudb/r/mvcc-3.result
  storage/tokudb/mysql-test/tokudb/r/mvcc-33.result
  storage/tokudb/mysql-test/tokudb/r/mvcc-34.result
  storage/tokudb/mysql-test/tokudb/r/mvcc-35.result
  storage/tokudb/mysql-test/tokudb/r/mvcc-36.result
  storage/tokudb/mysql-test/tokudb/r/mvcc-37.result
  storage/tokudb/mysql-test/tokudb/r/mvcc-38.result
  storage/tokudb/mysql-test/tokudb/r/mvcc-39.result
  storage/tokudb/mysql-test/tokudb/r/mvcc-4.result
  storage/tokudb/mysql-test/tokudb/r/mvcc-40.result
  storage/tokudb/mysql-test/tokudb/r/mvcc-5.result
  storage/tokudb/mysql-test/tokudb/r/mvcc-6.result
  storage/tokudb/mysql-test/tokudb/r/mvcc-7.result
  storage/tokudb/mysql-test/tokudb/r/mvcc-8.result
  storage/tokudb/mysql-test/tokudb/r/mvcc-9.result
  storage/tokudb/mysql-test/tokudb/r/mvcc-checksum-locks.result
  storage/tokudb/mysql-test/tokudb/r/type_binary.result
  storage/tokudb/mysql-test/tokudb/r/type_bit.result
  storage/tokudb/mysql-test/tokudb/r/type_blob.result
  storage/tokudb/mysql-test/tokudb/r/type_datetime.result
  storage/tokudb/mysql-test/tokudb/r/type_decimal.result
  storage/tokudb/mysql-test/tokudb/r/type_enum.result
  storage/tokudb/mysql-test/tokudb/r/type_float.result
  storage/tokudb/mysql-test/tokudb/r/type_nchar.result
  storage/tokudb/mysql-test/tokudb/r/type_newdecimal.result
  storage/tokudb/mysql-test/tokudb/r/type_set.result
  storage/tokudb/mysql-test/tokudb/r/type_timestamp.result
  storage/tokudb/mysql-test/tokudb/r/type_varchar.result
  storage/tokudb/mysql-test/tokudb/t/auto_increment.test
  storage/tokudb/mysql-test/tokudb/t/auto_increment_boundary.test
  storage/tokudb/mysql-test/tokudb/t/auto_increment_boundary_traditional.test
  storage/tokudb/mysql-test/tokudb/t/bulk-fetch.test
  storage/tokudb/mysql-test/tokudb/t/bulk-fetch2.test
  storage/tokudb/mysql-test/tokudb/t/change_column_all_1000_1.test
  storage/tokudb/mysql-test/tokudb/t/change_column_all_1000_10.test
  storage/tokudb/mysql-test/tokudb/t/change_column_auto_inc.test
  storage/tokudb/mysql-test/tokudb/t/change_column_bin.test
  storage/tokudb/mysql-test/tokudb/t/change_column_bin_descriptor.test
  storage/tokudb/mysql-test/tokudb/t/change_column_bin_key.test
  storage/tokudb/mysql-test/tokudb/t/change_column_bin_pad.test
  storage/tokudb/mysql-test/tokudb/t/change_column_bin_rename.test
  storage/tokudb/mysql-test/tokudb/t/change_column_blob.test
  storage/tokudb/mysql-test/tokudb/t/change_column_char.test
  storage/tokudb/mysql-test/tokudb/t/change_column_char_binary.test
  storage/tokudb/mysql-test/tokudb/t/change_column_char_charbinary.test
  storage/tokudb/mysql-test/tokudb/t/change_column_char_charset.test
  storage/tokudb/mysql-test/tokudb/t/change_column_char_default.test
  storage/tokudb/mysql-test/tokudb/t/change_column_char_descriptor.test
  storage/tokudb/mysql-test/tokudb/t/change_column_char_key.test
  storage/tokudb/mysql-test/tokudb/t/change_column_char_null.test
  storage/tokudb/mysql-test/tokudb/t/change_column_char_rename.test
  storage/tokudb/mysql-test/tokudb/t/change_column_int.test
  storage/tokudb/mysql-test/tokudb/t/change_column_int_default.test
  storage/tokudb/mysql-test/tokudb/t/change_column_int_descriptor.test
  storage/tokudb/mysql-test/tokudb/t/change_column_int_key.test
  storage/tokudb/mysql-test/tokudb/t/change_column_int_not_supported.test
  storage/tokudb/mysql-test/tokudb/t/change_column_int_rename.test
  storage/tokudb/mysql-test/tokudb/t/change_column_multiple_columns.test
  storage/tokudb/mysql-test/tokudb/t/change_column_text.test
  storage/tokudb/mysql-test/tokudb/t/change_column_varbin.test
  storage/tokudb/mysql-test/tokudb/t/change_column_varbin_cross256.test
  storage/tokudb/mysql-test/tokudb/t/change_column_varbin_default.test
  storage/tokudb/mysql-test/tokudb/t/change_column_varbin_descriptor.test
  storage/tokudb/mysql-test/tokudb/t/change_column_varbin_key.test
  storage/tokudb/mysql-test/tokudb/t/change_column_varbin_multiple.test
  storage/tokudb/mysql-test/tokudb/t/change_column_varbin_null.test
  storage/tokudb/mysql-test/tokudb/t/change_column_varbin_rename.test
  storage/tokudb/mysql-test/tokudb/t/change_column_varbin_varchar.test
  storage/tokudb/mysql-test/tokudb/t/change_column_varchar.test
  storage/tokudb/mysql-test/tokudb/t/change_column_varchar_charset.test
  storage/tokudb/mysql-test/tokudb/t/change_column_varchar_cross256.test
  storage/tokudb/mysql-test/tokudb/t/change_column_varchar_default.test
  storage/tokudb/mysql-test/tokudb/t/change_column_varchar_descriptor.test
  storage/tokudb/mysql-test/tokudb/t/change_column_varchar_key.test
  storage/tokudb/mysql-test/tokudb/t/change_column_varchar_null.test
  storage/tokudb/mysql-test/tokudb/t/change_column_varchar_prefix_a.test
  storage/tokudb/mysql-test/tokudb/t/change_column_varchar_prefix_b.test
  storage/tokudb/mysql-test/tokudb/t/change_column_varchar_rename.test
  storage/tokudb/mysql-test/tokudb/t/change_column_varchar_sum_cross256.test
  storage/tokudb/mysql-test/tokudb/t/change_column_varchar_varbin.test
  storage/tokudb/mysql-test/tokudb/t/cluster_1829.test
  storage/tokudb/mysql-test/tokudb/t/cluster_2968-0.test
  storage/tokudb/mysql-test/tokudb/t/cluster_2968-1.test
  storage/tokudb/mysql-test/tokudb/t/cluster_2968-2.test
  storage/tokudb/mysql-test/tokudb/t/cluster_2968-3.test
  storage/tokudb/mysql-test/tokudb/t/cluster_create_table.test
  storage/tokudb/mysql-test/tokudb/t/cluster_delete.test
  storage/tokudb/mysql-test/tokudb/t/cluster_delete2.test
  storage/tokudb/mysql-test/tokudb/t/cluster_filter.test
  storage/tokudb/mysql-test/tokudb/t/cluster_filter_hidden.test
  storage/tokudb/mysql-test/tokudb/t/cluster_filter_key.test
  storage/tokudb/mysql-test/tokudb/t/cluster_filter_unpack_varchar.test
  storage/tokudb/mysql-test/tokudb/t/cluster_filter_unpack_varchar_and_int_hidden.test
  storage/tokudb/mysql-test/tokudb/t/cluster_filter_unpack_varchar_hidden.test
  storage/tokudb/mysql-test/tokudb/t/cluster_filter_varchar_prefix.test
  storage/tokudb/mysql-test/tokudb/t/cluster_key.test
  storage/tokudb/mysql-test/tokudb/t/cluster_query_plan.test
  storage/tokudb/mysql-test/tokudb/t/cluster_tokudb_bug_993.test
  storage/tokudb/mysql-test/tokudb/t/cluster_tokudb_bug_993_2.test
  storage/tokudb/mysql-test/tokudb/t/cluster_update.test
  storage/tokudb/mysql-test/tokudb/t/cluster_update2.test
  storage/tokudb/mysql-test/tokudb/t/ctype_ascii.test
  storage/tokudb/mysql-test/tokudb/t/ctype_collate.test
  storage/tokudb/mysql-test/tokudb/t/ctype_cp1250_ch.test
  storage/tokudb/mysql-test/tokudb/t/ctype_cp1251.test
  storage/tokudb/mysql-test/tokudb/t/hotindex-del-0.test
  storage/tokudb/mysql-test/tokudb/t/hotindex-del-1.test
  storage/tokudb/mysql-test/tokudb/t/hotindex-del-fast.test
  storage/tokudb/mysql-test/tokudb/t/hotindex-del-slow.test
  storage/tokudb/mysql-test/tokudb/t/hotindex-insert-0.test
  storage/tokudb/mysql-test/tokudb/t/hotindex-insert-1.test
  storage/tokudb/mysql-test/tokudb/t/hotindex-insert-2.test
  storage/tokudb/mysql-test/tokudb/t/hotindex-insert-bigchar.test
  storage/tokudb/mysql-test/tokudb/t/hotindex-update-0.test
  storage/tokudb/mysql-test/tokudb/t/hotindex-update-1.test
  storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_released.test
  storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_timeout.test
  storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_locks_released.test
  storage/tokudb/mysql-test/tokudb/t/information-schema-global-status.test
  storage/tokudb/mysql-test/tokudb/t/lockretry-insert.writelocktable.test
  storage/tokudb/mysql-test/tokudb/t/lockretry-writelocktable.insert.test
  storage/tokudb/mysql-test/tokudb/t/lockretry-writelocktable.insert2.test
  storage/tokudb/mysql-test/tokudb/t/locks-blocking-row-locks-getset.test
  storage/tokudb/mysql-test/tokudb/t/locks-blocking-row-locks.test
  storage/tokudb/mysql-test/tokudb/t/locks-delete-deadlock-1.test
  storage/tokudb/mysql-test/tokudb/t/locks-no-read-lock-serializable-autocommit.test
  storage/tokudb/mysql-test/tokudb/t/locks-select-update-1.test
  storage/tokudb/mysql-test/tokudb/t/locks-select-update-2.test
  storage/tokudb/mysql-test/tokudb/t/locks-select-update-3.test
  storage/tokudb/mysql-test/tokudb/t/locks-update-deadlock-1.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-1.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-10.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-11.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-12.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-13.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-14.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-15.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-16.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-17.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-18.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-19.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-2.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-20.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-21.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-22.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-23.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-24.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-25.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-26.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-27.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-28.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-2808-read-committed.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-2808-read-uncommitted.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-29.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-3.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-30.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-31.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-33.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-34.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-35.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-36.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-37.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-38.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-39.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-4.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-40.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-5.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-6.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-7.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-8.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-9.test
  storage/tokudb/mysql-test/tokudb/t/mvcc-checksum-locks.test
  storage/tokudb/mysql-test/tokudb/t/nested_txn_autocommit.test
  storage/tokudb/mysql-test/tokudb/t/nested_txn_begin.test
  storage/tokudb/mysql-test/tokudb/t/nested_txn_implicit_commit.test
  storage/tokudb/mysql-test/tokudb/t/prim_key_1.test
  storage/tokudb/mysql-test/tokudb/t/prim_key_2.test
  storage/tokudb/mysql-test/tokudb/t/prim_key_3.test
  storage/tokudb/mysql-test/tokudb/t/prim_key_4.test
  storage/tokudb/mysql-test/tokudb/t/prim_key_5.test
  storage/tokudb/mysql-test/tokudb/t/prim_key_6.test
  storage/tokudb/mysql-test/tokudb/t/replace-ignore.test
  storage/tokudb/mysql-test/tokudb/t/rows-32m-0.test
  storage/tokudb/mysql-test/tokudb/t/rows-32m-1.test
  storage/tokudb/mysql-test/tokudb/t/rows-32m-rand-insert.test
  storage/tokudb/mysql-test/tokudb/t/rows-32m-seq-insert.test
  storage/tokudb/mysql-test/tokudb/t/savepoint-3.test
  storage/tokudb/mysql-test/tokudb/t/simple_delete_all.test
  storage/tokudb/mysql-test/tokudb/t/simple_join_tokudb_myisam.test
  storage/tokudb/mysql-test/tokudb/t/simple_truncate.test
  storage/tokudb/mysql-test/tokudb/t/truncate_row_count.test
  storage/tokudb/mysql-test/tokudb/t/truncate_txn_commit.test
  storage/tokudb/mysql-test/tokudb/t/truncate_txn_rollback.test
  storage/tokudb/mysql-test/tokudb/t/type_varchar.test
  storage/tokudb/mysql-test/tokudb_add_index/r/hot_create_unique_index.result
  storage/tokudb/mysql-test/tokudb_add_index/t/1522.test
  storage/tokudb/mysql-test/tokudb_add_index/t/add_index_1.test
  storage/tokudb/mysql-test/tokudb_add_index/t/add_index_10.test
  storage/tokudb/mysql-test/tokudb_add_index/t/add_index_11.test
  storage/tokudb/mysql-test/tokudb_add_index/t/add_index_12.test
  storage/tokudb/mysql-test/tokudb_add_index/t/add_index_13.test
  storage/tokudb/mysql-test/tokudb_add_index/t/add_index_14.test
  storage/tokudb/mysql-test/tokudb_add_index/t/add_index_16.test
  storage/tokudb/mysql-test/tokudb_add_index/t/add_index_17.test
  storage/tokudb/mysql-test/tokudb_add_index/t/add_index_18.test
  storage/tokudb/mysql-test/tokudb_add_index/t/add_index_2.test
  storage/tokudb/mysql-test/tokudb_add_index/t/add_index_3.test
  storage/tokudb/mysql-test/tokudb_add_index/t/add_index_4.test
  storage/tokudb/mysql-test/tokudb_add_index/t/add_index_6.test
  storage/tokudb/mysql-test/tokudb_add_index/t/add_index_7.test
  storage/tokudb/mysql-test/tokudb_add_index/t/add_index_8.test
  storage/tokudb/mysql-test/tokudb_add_index/t/add_index_9.test
  storage/tokudb/mysql-test/tokudb_add_index/t/falcon_bug_23691.test
  storage/tokudb/mysql-test/tokudb_add_index/t/falcon_bug_23692.test
  storage/tokudb/mysql-test/tokudb_add_index/t/hot_create_unique_index.test
  storage/tokudb/mysql-test/tokudb_add_index/t/tokudb_bug_1152.test
  storage/tokudb/mysql-test/tokudb_alter_table/r/ai_part.result
  storage/tokudb/mysql-test/tokudb_alter_table/r/alter_column_default.result
  storage/tokudb/mysql-test/tokudb_alter_table/r/auto_inc.result
  storage/tokudb/mysql-test/tokudb_alter_table/r/fractional_time_alter_table.result
  storage/tokudb/mysql-test/tokudb_alter_table/r/frm_discover.result
  storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_and_rename_table.result
  storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_part.result
  storage/tokudb/mysql-test/tokudb_alter_table/r/hcr.result
  storage/tokudb/mysql-test/tokudb_alter_table/r/hcr3.result
  storage/tokudb/mysql-test/tokudb_alter_table/r/other_alter.result
  storage/tokudb/mysql-test/tokudb_alter_table/r/other_alter2.result
  storage/tokudb/mysql-test/tokudb_alter_table/r/row_format_alter.result
  storage/tokudb/mysql-test/tokudb_alter_table/r/test_field_same_detection.result
  storage/tokudb/mysql-test/tokudb_alter_table/t/5260.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/ai_di.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/auto_inc.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_add.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_add2.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_add3.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_blob_add.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_blob_drop.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_drop.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_fixed_add.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_fixed_drop.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_var_add.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_var_drop.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_and_rename_table.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_clustering.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_clustering2.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_diff_num_offset_bytes.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_fixedblob_add.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_fixedblob_add2.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_fixedblob_drop.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_fixedvar_add.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_fixedvar_add2.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_fixedvar_drop.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_indexing_mix.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_null_bits.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_pk.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_pk2.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_template.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_tmp_tables.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_tmp_tables_56.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_varblob_add.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_varblob_add2.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_varblob_drop.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_with_dels.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_with_lock_sps.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_with_locks.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcr.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcr2.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hcr3.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/hot_row_format_alter.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/other_alter.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/other_alter2.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/row_format_alter.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/test_field_same_detection.test
  storage/tokudb/mysql-test/tokudb_alter_table/t/virtual_columns.test
  storage/tokudb/mysql-test/tokudb_bugs/disabled.def
  storage/tokudb/mysql-test/tokudb_bugs/r/2952.result
  storage/tokudb/mysql-test/tokudb_bugs/r/2970.result
  storage/tokudb/mysql-test/tokudb_bugs/r/4676.result
  storage/tokudb/mysql-test/tokudb_bugs/r/5089.result
  storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock.result
  storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock_3.result
  storage/tokudb/mysql-test/tokudb_bugs/r/dict_leak_3518.result
  storage/tokudb/mysql-test/tokudb_bugs/r/expand_tinytext_text.result
  storage/tokudb/mysql-test/tokudb_bugs/r/fractional_time.result
  storage/tokudb/mysql-test/tokudb_bugs/r/frm_store.result
  storage/tokudb/mysql-test/tokudb_bugs/r/frm_store2.result
  storage/tokudb/mysql-test/tokudb_bugs/r/frm_store3.result
  storage/tokudb/mysql-test/tokudb_bugs/r/tokudb_drop_part_table_668.result
  storage/tokudb/mysql-test/tokudb_bugs/r/tokudb_drop_simple_table_668.result
  storage/tokudb/mysql-test/tokudb_bugs/r/tokudb_mrr.result
  storage/tokudb/mysql-test/tokudb_bugs/r/tokudb_mrr2.result
  storage/tokudb/mysql-test/tokudb_bugs/t/1913.test
  storage/tokudb/mysql-test/tokudb_bugs/t/1938.test
  storage/tokudb/mysql-test/tokudb_bugs/t/1949.test
  storage/tokudb/mysql-test/tokudb_bugs/t/2043.test
  storage/tokudb/mysql-test/tokudb_bugs/t/2219.test
  storage/tokudb/mysql-test/tokudb_bugs/t/2262.test
  storage/tokudb/mysql-test/tokudb_bugs/t/2383.test
  storage/tokudb/mysql-test/tokudb_bugs/t/2458.test
  storage/tokudb/mysql-test/tokudb_bugs/t/2548.test
  storage/tokudb/mysql-test/tokudb_bugs/t/2641.test
  storage/tokudb/mysql-test/tokudb_bugs/t/2952.test
  storage/tokudb/mysql-test/tokudb_bugs/t/2970.test
  storage/tokudb/mysql-test/tokudb_bugs/t/3014.test
  storage/tokudb/mysql-test/tokudb_bugs/t/3015.test
  storage/tokudb/mysql-test/tokudb_bugs/t/3083.test
  storage/tokudb/mysql-test/tokudb_bugs/t/4472.test
  storage/tokudb/mysql-test/tokudb_bugs/t/4656.test
  storage/tokudb/mysql-test/tokudb_bugs/t/4656_2.test
  storage/tokudb/mysql-test/tokudb_bugs/t/5089.test
  storage/tokudb/mysql-test/tokudb_bugs/t/5733_innodb.test
  storage/tokudb/mysql-test/tokudb_bugs/t/6053.test
  storage/tokudb/mysql-test/tokudb_bugs/t/6684.test
  storage/tokudb/mysql-test/tokudb_bugs/t/checkpoint_lock.test
  storage/tokudb/mysql-test/tokudb_bugs/t/checkpoint_lock_3.test
  storage/tokudb/mysql-test/tokudb_bugs/t/expand_tinytext_text.test
  storage/tokudb/mysql-test/tokudb_bugs/t/fileops-4.test
  storage/tokudb/mysql-test/tokudb_bugs/t/ft-index-40.test
  storage/tokudb/mysql-test/tokudb_bugs/t/index_read.test
  storage/tokudb/mysql-test/tokudb_bugs/t/tokudb_drop_part_table_668.test
  storage/tokudb/mysql-test/tokudb_bugs/t/tokudb_drop_simple_table_668.test
  storage/tokudb/mysql-test/tokudb_bugs/t/xa-1.test
  storage/tokudb/mysql-test/tokudb_bugs/t/xa-2.test
  storage/tokudb/mysql-test/tokudb_bugs/t/xa-6.test
  storage/tokudb/mysql-test/tokudb_mariadb/r/alter.result
  storage/tokudb/mysql-test/tokudb_mariadb/r/clustering.result
  storage/tokudb/mysql-test/tokudb_mariadb/r/compression.result
  storage/tokudb/mysql-test/tokudb_mariadb/t/compression.test
  storage/tokudb/scripts/common.sh
  storage/tokudb/scripts/make.mysql.bash
  storage/tokudb/scripts/make.mysql.debug.env.bash
  storage/tokudb/scripts/nightly.mysql.build.and.test.bash
  storage/tokudb/scripts/run.atc.ontime.bash
  storage/tokudb/scripts/run.mysql.tests.bash
  storage/tokudb/scripts/run.sql.bench.bash
  storage/tokudb/scripts/run.tpch.bash
  storage/tokudb/scripts/setup.mysql.bash
  storage/tokudb/scripts/tokutek.make.mysql.bash
  storage/tokudb/tokudb_card.h
  storage/tokudb/tokudb_update_fun.cc
  storage/xtradb/CMakeLists.txt
  storage/xtradb/api/api0api.cc
  storage/xtradb/btr/btr0btr.cc
  storage/xtradb/btr/btr0cur.cc
  storage/xtradb/btr/btr0pcur.cc
  storage/xtradb/buf/buf0buf.cc
  storage/xtradb/buf/buf0flu.cc
  storage/xtradb/dict/dict0crea.cc
  storage/xtradb/dict/dict0dict.cc
  storage/xtradb/dict/dict0load.cc
  storage/xtradb/dict/dict0mem.cc
  storage/xtradb/dict/dict0stats.cc
  storage/xtradb/fil/fil0fil.cc
  storage/xtradb/fts/fts0config.cc
  storage/xtradb/fts/fts0fts.cc
  storage/xtradb/fts/fts0opt.cc
  storage/xtradb/fts/fts0que.cc
  storage/xtradb/handler/ha_innodb.cc
  storage/xtradb/handler/handler0alter.cc
  storage/xtradb/handler/i_s.cc
  storage/xtradb/handler/xtradb_i_s.cc
  storage/xtradb/ibuf/ibuf0ibuf.cc
  storage/xtradb/include/api0api.h
  storage/xtradb/include/btr0cur.h
  storage/xtradb/include/btr0pcur.h
  storage/xtradb/include/btr0pcur.ic
  storage/xtradb/include/btr0sea.h
  storage/xtradb/include/buf0flu.h
  storage/xtradb/include/buf0flu.ic
  storage/xtradb/include/db0err.h
  storage/xtradb/include/dict0stats.ic
  storage/xtradb/include/dict0types.h
  storage/xtradb/include/fts0fts.h
  storage/xtradb/include/fts0types.h
  storage/xtradb/include/ibuf0ibuf.h
  storage/xtradb/include/log0log.h
  storage/xtradb/include/mtr0mtr.h
  storage/xtradb/include/mtr0mtr.ic
  storage/xtradb/include/os0file.h
  storage/xtradb/include/row0ftsort.h
  storage/xtradb/include/srv0conc.h
  storage/xtradb/include/srv0mon.h
  storage/xtradb/include/srv0mon.ic
  storage/xtradb/include/sync0arr.h
  storage/xtradb/include/sync0arr.ic
  storage/xtradb/include/sync0rw.h
  storage/xtradb/include/sync0rw.ic
  storage/xtradb/include/sync0sync.h
  storage/xtradb/include/sync0sync.ic
  storage/xtradb/include/sync0types.h
  storage/xtradb/include/trx0trx.h
  storage/xtradb/include/univ.i
  storage/xtradb/include/ut0bh.h
  storage/xtradb/include/ut0bh.ic
  storage/xtradb/log/log0log.cc
  storage/xtradb/log/log0online.cc
  storage/xtradb/log/log0recv.cc
  storage/xtradb/mtr/mtr0mtr.cc
  storage/xtradb/os/os0file.cc
  storage/xtradb/os/os0thread.cc
  storage/xtradb/row/row0ftsort.cc
  storage/xtradb/row/row0log.cc
  storage/xtradb/row/row0merge.cc
  storage/xtradb/row/row0mysql.cc
  storage/xtradb/row/row0quiesce.cc
  storage/xtradb/row/row0sel.cc
  storage/xtradb/srv/srv0mon.cc
  storage/xtradb/srv/srv0start.cc
  storage/xtradb/sync/sync0arr.cc
  storage/xtradb/sync/sync0rw.cc
  storage/xtradb/sync/sync0sync.cc
  storage/xtradb/trx/trx0purge.cc
  storage/xtradb/trx/trx0sys.cc
  storage/xtradb/trx/trx0trx.cc
  storage/xtradb/ut/ut0ut.cc
  strings/CMakeLists.txt
  strings/ctype-bin.c
  strings/ctype-mb.c
  strings/ctype-simple.c
  strings/ctype-uca.c
  strings/ctype-ucs2.c
  strings/ctype-utf8.c
  strings/ctype-win1250ch.c
  strings/ctype.c
  strings/decimal.c
  strings/dtoa.c
  strings/t_ctype.h
  support-files/MySQL-shared-compat.spec.sh
  support-files/compiler_warnings.supp
  support-files/mysql.server.sh
  support-files/rpm/server-postun.sh
  support-files/rpm/server-prein.sh
  tests/connect_test.c
  tests/fork_big.pl
  tests/fork_big2.pl
  tests/insert_test.c
  tests/list_test.c
  tests/mysql_client_test.c
  tests/select_test.c
  tests/showdb_test.c
  tests/ssl_test.c
  unittest/mysys/CMakeLists.txt
  unittest/mysys/bitmap-t.c
  unittest/mysys/ma_dyncol-t.c
  vio/CMakeLists.txt
  vio/vio.c
  vio/viosocket.c
  vio/viossl.c
  vio/viosslfactories.c
  zlib/CMakeLists.txt
  libmysql/libmysql_versions.ld.in
  mysql-test/suite/roles/grant_empty.result
  mysql-test/suite/roles/grant_empty.test
pending merges:
  Olivier Bertrand 2014-04-22 - FIX a bug causing libxml2 not retrieving expanded multiple co...

.bzrignore

@@ -1455,4 +1455,4 @@ storage/tokudb/ft-index/utils/tokudb_gen
 storage/tokudb/ft-index/utils/tokudb_load
 storage/connect/connect.cnf
 storage/cassandra/cassandra.cnf
-libmysql/libmysql.version
+libmysql/libmysql_versions.ld

CMakeLists.txt

@@ -153,6 +153,7 @@ INCLUDE(readline)
 INCLUDE(libutils)
 INCLUDE(dtrace)
 INCLUDE(jemalloc)
+INCLUDE(pcre)
 INCLUDE(ctest)
 INCLUDE(plugin)
 INCLUDE(install_macros)
@@ -329,8 +330,15 @@ SET(PLUGINDIR "${DEFAULT_MYSQL_HOME}/${INSTALL_PLUGINDIR}")
 IF(INSTALL_SYSCONFDIR)
   SET(DEFAULT_SYSCONFDIR "${INSTALL_SYSCONFDIR}")
 ENDIF()
+
+OPTION(TMPDIR
+"PATH to MySQL TMP dir. If unspecified, defaults to P_tmpdir in <stdio.h>" OFF)
 IF(TMPDIR)
-  SET(DEFAULT_TMPDIR "${TMPDIR}")
+  # Quote it, to make it a const char string.
+  SET(DEFAULT_TMPDIR "\"${TMPDIR}\"")
+ELSE()
+  # Do not quote it, to refer to the P_tmpdir macro in <stdio.h>.
+  SET(DEFAULT_TMPDIR "P_tmpdir")
 ENDIF()
 
 # Run platform tests
@@ -352,8 +360,11 @@ MYSQL_CHECK_SSL()
 # Add readline or libedit.
 MYSQL_CHECK_READLINE()
 
+SET(MALLOC_LIBRARY "system")
 CHECK_JEMALLOC()
 
+CHECK_PCRE()
+
 #
 # Setup maintainer mode options. Platform checks are
 # not run with the warning options as to not perturb fragile checks
@@ -389,7 +400,6 @@ ADD_SUBDIRECTORY(include)
 ADD_SUBDIRECTORY(dbug)
 ADD_SUBDIRECTORY(strings)
 ADD_SUBDIRECTORY(vio)
-ADD_SUBDIRECTORY(pcre)
 ADD_SUBDIRECTORY(mysys)
 ADD_SUBDIRECTORY(mysys_ssl)
 ADD_SUBDIRECTORY(libmysql)
@@ -417,6 +427,7 @@ IF(NOT WITHOUT_SERVER)
     ADD_SUBDIRECTORY(internal)
   ENDIF()
   ADD_SUBDIRECTORY(packaging/rpm-uln)
+  ADD_SUBDIRECTORY(packaging/rpm-oel)
 ENDIF()
 
 IF(UNIX)

CREDITS

@@ -3,9 +3,10 @@ organization.
 
 The current main members and sponsors of the MariaDB foundation are:
 
-Booking.com	http://www.booking.com
-SkySQL Ab	http://www.skysql.com
-Parallels       http://www.parallels.com/products/plesk
+Automattic      http://automattic.com  (2014)
+SkySQL Ab	http://www.skysql.com  (2013, 2014)
+Booking.com	http://www.booking.com (2013)
+Parallels       http://www.parallels.com/products/plesk  (2013)
 
 For a full list of supporters and sponsors see
 https://mariadb.org/en/supporters/

VERSION

@@ -4,5 +4,5 @@
 #
 MYSQL_VERSION_MAJOR=10
 MYSQL_VERSION_MINOR=0
-MYSQL_VERSION_PATCH=8
+MYSQL_VERSION_PATCH=11
 MYSQL_VERSION_EXTRA=

client/CMakeLists.txt

@@ -15,8 +15,7 @@
 
 INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/include
-  ${CMAKE_BINARY_DIR}/pcre
-  ${CMAKE_SOURCE_DIR}/pcre
+  ${PCRE_INCLUDES}
   ${CMAKE_SOURCE_DIR}/mysys_ssl
   ${ZLIB_INCLUDE_DIR}
   ${SSL_INCLUDE_DIRS}

client/mysql.cc

@@ -1,6 +1,7 @@
 /*
    Copyright (c) 2000, 2013, Oracle and/or its affiliates.
    Copyright (c) 2009, 2013, Monty Program Ab.
+   Copyright (c) 2013, 2014, SkySQL Ab
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -915,6 +916,7 @@ static COMMANDS commands[] = {
   { "MAKE_SET", 0, 0, 0, ""},
   { "MAKEDATE", 0, 0, 0, ""},
   { "MAKETIME", 0, 0, 0, ""},
+  { "MASTER_GTID_WAIT", 0, 0, 0, ""},
   { "MASTER_POS_WAIT", 0, 0, 0, ""},
   { "MAX", 0, 0, 0, ""},
   { "MBRCONTAINS", 0, 0, 0, ""},
@@ -1175,12 +1177,9 @@ int main(int argc,char *argv[])
     exit(1);
   }
   defaults_argv=argv;
-  if (get_options(argc, (char **) argv))
-  {
-    free_defaults(defaults_argv);
-    my_end(0);
-    exit(1);
-  }
+  if ((status.exit_status= get_options(argc, (char **) argv)))
+    mysql_end(-1);
+
   if (status.batch && !status.line_buff &&
       !(status.line_buff= batch_readline_init(MAX_BATCH_BUFFER_SIZE, stdin)))
   {
@@ -1876,7 +1875,7 @@ static int get_options(int argc, char **argv)
   opt_net_buffer_length= *mysql_params->p_net_buffer_length;
 
   if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))
-    exit(ho_error);
+    return(ho_error);
 
   *mysql_params->p_max_allowed_packet= opt_max_allowed_packet;
   *mysql_params->p_net_buffer_length= opt_net_buffer_length;

client/mysql_plugin.c

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -857,7 +857,7 @@ static int process_options(int argc, char *argv[], char *operation)
       strncat(buff, FN_DIRSEP, sizeof(buff) - strlen(buff) - 1);
 #endif
       buff[sizeof(buff) - 1]= 0;
-      my_delete(opt_basedir, MYF(0));
+      my_free(opt_basedir);
       opt_basedir= my_strdup(buff, MYF(MY_FAE));
     }
   }

client/mysqlcheck.c

@@ -1047,7 +1047,7 @@ int main(int argc, char **argv)
     for (i = 0; i < alter_table_cmds.elements ; i++)
       run_query((char*) dynamic_array_ptr(&alter_table_cmds, i));
   }
-  ret= test(first_error);
+  ret= MY_TEST(first_error);
 
  end:
   dbDisconnect(current_host);

client/mysqldump.c

@@ -39,7 +39,7 @@
 ** 10 Jun 2003: SET NAMES and --no-set-names by Alexander Barkov
 */
 
-#define DUMP_VERSION "10.14"
+#define DUMP_VERSION "10.15"
 
 #include <my_global.h>
 #include <my_sys.h>
@@ -137,6 +137,12 @@ static uint opt_slave_data;
 static uint my_end_arg;
 static char * opt_mysql_unix_port=0;
 static int   first_error=0;
+/*
+  multi_source is 0 if old server or 2 if server that support multi source 
+  This is choosen this was as multi_source has 2 extra columns first in
+  SHOW ALL SLAVES STATUS.
+*/
+static uint multi_source= 0;
 static DYNAMIC_STRING extended_row;
 #include <sslopt-vars.h>
 FILE *md_result_file= 0;
@@ -160,6 +166,8 @@ static void dynstr_set_checked(DYNAMIC_STRING *str, const char *init_str);
 static void dynstr_append_mem_checked(DYNAMIC_STRING *str, const char *append,
 			  uint length);
 static void dynstr_realloc_checked(DYNAMIC_STRING *str, ulong additional_size);
+
+static int do_start_slave_sql(MYSQL *mysql_con);
 /*
   Constant for detection of default value of default_charset.
   If default_charset is equal to mysql_universal_client_charset, then
@@ -1494,6 +1502,8 @@ static void free_resources()
 
 static void maybe_exit(int error)
 {
+  if (opt_slave_data)
+    do_start_slave_sql(mysql);
   if (!first_error)
     first_error= error;
   if (ignore_errors)
@@ -3649,7 +3659,8 @@ static void dump_table(char *table, char *db)
                    field->type == MYSQL_TYPE_BLOB ||
                    field->type == MYSQL_TYPE_LONG_BLOB ||
                    field->type == MYSQL_TYPE_MEDIUM_BLOB ||
-                   field->type == MYSQL_TYPE_TINY_BLOB)) ? 1 : 0;
+                   field->type == MYSQL_TYPE_TINY_BLOB ||
+                   field->type == MYSQL_TYPE_GEOMETRY)) ? 1 : 0;
         if (extended_insert && !opt_xml)
         {
           if (i == 0)
@@ -3993,7 +4004,13 @@ static int dump_tablespaces(char* ts_where)
   char *ubs;
   char *endsemi;
   DBUG_ENTER("dump_tablespaces");
-
+  
+  /*
+    Try to turn off semi-join optimization (if that fails, this is a
+    pre-optimizer_switch server, and the old query plan is ok for us.
+  */
+  mysql_query(mysql, "set optimizer_switch='semijoin=off'");
+ 
   init_dynamic_string_checked(&sqlbuf,
                       "SELECT LOGFILE_GROUP_NAME,"
                       " FILE_NAME,"
@@ -4153,6 +4170,8 @@ static int dump_tablespaces(char* ts_where)
 
   mysql_free_result(tableres);
   dynstr_free(&sqlbuf);
+  mysql_query(mysql, "set optimizer_switch=default");
+
   DBUG_RETURN(0);
 }
 
@@ -4735,7 +4754,8 @@ static int do_show_master_status(MYSQL *mysql_con, int consistent_binlog_pos)
   }
   else
   {
-    if (mysql_query_with_error_report(mysql_con, &master, "SHOW MASTER STATUS"))
+    if (mysql_query_with_error_report(mysql_con, &master,
+                                      "SHOW MASTER STATUS"))
       return 1;
 
     row= mysql_fetch_row(master);
@@ -4780,29 +4800,37 @@ static int do_show_master_status(MYSQL *mysql_con, int consistent_binlog_pos)
 static int do_stop_slave_sql(MYSQL *mysql_con)
 {
   MYSQL_RES *slave;
-  /* We need to check if the slave sql is running in the first place */
-  if (mysql_query_with_error_report(mysql_con, &slave, "SHOW SLAVE STATUS"))
+  MYSQL_ROW row;
+
+  if (mysql_query_with_error_report(mysql_con, &slave,
+                                    multi_source ?
+                                    "SHOW ALL SLAVES STATUS" :
+                                    "SHOW SLAVE STATUS"))
     return(1);
-  else
+
+  /* Loop over all slaves */
+  while ((row= mysql_fetch_row(slave)))
   {
-    MYSQL_ROW row= mysql_fetch_row(slave);
-    if (row && row[11])
+    if (row[11 + multi_source])
     {
       /* if SLAVE SQL is not running, we don't stop it */
-      if (!strcmp(row[11],"No"))
+      if (strcmp(row[11 + multi_source], "No"))
       {
-        mysql_free_result(slave);
-        /* Silently assume that they don't have the slave running */
-        return(0);
+        char query[160];
+        if (multi_source)
+          sprintf(query, "STOP SLAVE '%.80s' SQL_THREAD", row[0]);
+        else
+          strmov(query, "STOP SLAVE SQL_THREAD");
+
+        if (mysql_query_with_error_report(mysql_con, 0, query))
+        {
+          mysql_free_result(slave);
+          return 1;
+        }
       }
     }
   }
   mysql_free_result(slave);
-
-  /* now, stop slave if running */
-  if (mysql_query_with_error_report(mysql_con, 0, "STOP SLAVE SQL_THREAD"))
-    return(1);
-
   return(0);
 }
 
@@ -4811,7 +4839,10 @@ static int add_stop_slave(void)
   if (opt_comments)
     fprintf(md_result_file,
             "\n--\n-- stop slave statement to make a recovery dump)\n--\n\n");
-  fprintf(md_result_file, "STOP SLAVE;\n");
+  if (multi_source)
+    fprintf(md_result_file, "STOP ALL SLAVES;\n");
+  else
+    fprintf(md_result_file, "STOP SLAVE;\n");
   return(0);
 }
 
@@ -4820,16 +4851,24 @@ static int add_slave_statements(void)
   if (opt_comments)
     fprintf(md_result_file,
             "\n--\n-- start slave statement to make a recovery dump)\n--\n\n");
-  fprintf(md_result_file, "START SLAVE;\n");
+  if (multi_source)
+    fprintf(md_result_file, "START ALL SLAVES;\n");
+  else
+    fprintf(md_result_file, "START SLAVE;\n");
   return(0);
 }
 
 static int do_show_slave_status(MYSQL *mysql_con)
 {
   MYSQL_RES *UNINIT_VAR(slave);
+  MYSQL_ROW row;
   const char *comment_prefix=
     (opt_slave_data == MYSQL_OPT_SLAVE_DATA_COMMENTED_SQL) ? "-- " : "";
-  if (mysql_query_with_error_report(mysql_con, &slave, "SHOW SLAVE STATUS"))
+
+  if (mysql_query_with_error_report(mysql_con, &slave,
+                                    multi_source ?
+                                    "SHOW ALL SLAVES STATUS" :
+                                    "SHOW SLAVE STATUS"))
   {
     if (!ignore_errors)
     {
@@ -4839,10 +4878,10 @@ static int do_show_slave_status(MYSQL *mysql_con)
     mysql_free_result(slave);
     return 1;
   }
-  else
+
+  while ((row= mysql_fetch_row(slave)))
   {
-    MYSQL_ROW row= mysql_fetch_row(slave);
-    if (row && row[9] && row[21])
+    if (row[9 + multi_source] && row[21 + multi_source])
     {
       /* SHOW MASTER STATUS reports file and position */
       if (opt_comments)
@@ -4850,54 +4889,70 @@ static int do_show_slave_status(MYSQL *mysql_con)
                 "\n--\n-- Position to start replication or point-in-time "
                 "recovery from (the master of this slave)\n--\n\n");
 
-      fprintf(md_result_file, "%sCHANGE MASTER TO ", comment_prefix);
-
+      if (multi_source)
+        fprintf(md_result_file, "%sCHANGE MASTER '%.80s' TO ",
+                comment_prefix, row[0]);
+      else
+        fprintf(md_result_file, "%sCHANGE MASTER TO ", comment_prefix);
+      
       if (opt_include_master_host_port)
       {
-        if (row[1])
-          fprintf(md_result_file, "MASTER_HOST='%s', ", row[1]);
+        if (row[1 + multi_source])
+          fprintf(md_result_file, "MASTER_HOST='%s', ", row[1 + multi_source]);
         if (row[3])
-          fprintf(md_result_file, "MASTER_PORT=%s, ", row[3]);
+          fprintf(md_result_file, "MASTER_PORT=%s, ", row[3 + multi_source]);
       }
       fprintf(md_result_file,
-              "MASTER_LOG_FILE='%s', MASTER_LOG_POS=%s;\n", row[9], row[21]);
+              "MASTER_LOG_FILE='%s', MASTER_LOG_POS=%s;\n",
+              row[9 + multi_source], row[21 + multi_source]);
 
       check_io(md_result_file);
     }
-    mysql_free_result(slave);
   }
+  mysql_free_result(slave);
   return 0;
 }
 
 static int do_start_slave_sql(MYSQL *mysql_con)
 {
   MYSQL_RES *slave;
+  MYSQL_ROW row;
+  int error= 0;
+  DBUG_ENTER("do_start_slave_sql");
+
   /* We need to check if the slave sql is stopped in the first place */
-  if (mysql_query_with_error_report(mysql_con, &slave, "SHOW SLAVE STATUS"))
-    return(1);
-  else
+  if (mysql_query_with_error_report(mysql_con, &slave,
+                                    multi_source ?
+                                    "SHOW ALL SLAVES STATUS" :
+                                    "SHOW SLAVE STATUS"))
+    DBUG_RETURN(1);
+
+  while ((row= mysql_fetch_row(slave)))
   {
-    MYSQL_ROW row= mysql_fetch_row(slave);
-    if (row && row[11])
+    DBUG_PRINT("info", ("Connection: '%s'  status: '%s'",
+                        multi_source ? row[0] : "", row[11 + multi_source]));
+    if (row[11 + multi_source])
     {
       /* if SLAVE SQL is not running, we don't start it */
-      if (!strcmp(row[11],"Yes"))
+      if (strcmp(row[11 + multi_source], "Yes"))
       {
-        mysql_free_result(slave);
-        /* Silently assume that they don't have the slave running */
-        return(0);
+        char query[160];
+        if (multi_source)
+          sprintf(query, "START SLAVE '%.80s'", row[0]);
+        else
+          strmov(query, "START SLAVE");
+
+        if (mysql_query_with_error_report(mysql_con, 0, query))
+        {
+          fprintf(stderr, "%s: Error: Unable to start slave '%s'\n",
+                  my_progname_short, multi_source ? row[0] : "");
+          error= 1;
+        }
       }
     }
   }
   mysql_free_result(slave);
-
-  /* now, start slave if stopped */
-  if (mysql_query_with_error_report(mysql_con, 0, "START SLAVE"))
-  {
-    fprintf(stderr, "%s: Error: Unable to start slave\n", my_progname_short);
-    return 1;
-  }
-  return(0);
+  DBUG_RETURN(error);
 }
 
 
@@ -5575,6 +5630,10 @@ int main(int argc, char **argv)
   if (!path)
     write_header(md_result_file, *argv);
 
+  /* Check if the server support multi source */
+  if (mysql_get_server_version(mysql) >= 100000)
+    multi_source= 2;
+
   if (opt_slave_data && do_stop_slave_sql(mysql))
     goto err;
 
@@ -5654,10 +5713,6 @@ int main(int argc, char **argv)
     dump_databases(argv);
   }
 
-  /* if --dump-slave , start the slave sql thread */
-  if (opt_slave_data && do_start_slave_sql(mysql))
-    goto err;
-
   /* add 'START SLAVE' to end of dump */
   if (opt_slave_apply && add_slave_statements())
     goto err;
@@ -5673,9 +5728,6 @@ int main(int argc, char **argv)
   if (opt_delete_master_logs && purge_bin_logs_to(mysql, bin_log_name))
     goto err;
 
-#ifdef HAVE_SMEM
-  my_free(shared_memory_base_name);
-#endif
   /*
     No reason to explicitely COMMIT the transaction, neither to explicitely
     UNLOCK TABLES: these will be automatically be done by the server when we
@@ -5683,6 +5735,14 @@ int main(int argc, char **argv)
     server.
   */
 err:
+  /* if --dump-slave , start the slave sql thread */
+  if (opt_slave_data && do_start_slave_sql(mysql))
+    goto err;
+
+#ifdef HAVE_SMEM
+  my_free(shared_memory_base_name);
+#endif
+
   dbDisconnect(current_host);
   if (!path)
     write_footer(md_result_file);

client/mysqltest.cc

@@ -528,6 +528,7 @@ struct st_command
 {
   char *query, *query_buf,*first_argument,*last_argument,*end;
   DYNAMIC_STRING content;
+  DYNAMIC_STRING eval_query;
   int first_word_len, query_len;
   my_bool abort_on_error, used_replace;
   struct st_expected_errors expected_errors;
@@ -1399,6 +1400,8 @@ void free_used_memory()
   {
     struct st_command **q= dynamic_element(&q_lines, i, struct st_command**);
     my_free((*q)->query_buf);
+    if ((*q)->eval_query.str)
+      dynstr_free(&(*q)->eval_query);
     if ((*q)->content.str)
       dynstr_free(&(*q)->content);
     my_free((*q));
@@ -7940,6 +7943,7 @@ void handle_error(struct st_command *command,
 
   DBUG_ENTER("handle_error");
 
+  command->used_replace= 1;
   if (command->require_file)
   {
     /*
@@ -8342,7 +8346,6 @@ void run_query(struct st_connection *cn, struct st_command *command, int flags)
   DYNAMIC_STRING ds_result;
   DYNAMIC_STRING ds_sorted;
   DYNAMIC_STRING ds_warnings;
-  DYNAMIC_STRING eval_query;
   char *query;
   int query_len;
   my_bool view_created= 0, sp_created= 0;
@@ -8365,10 +8368,14 @@ void run_query(struct st_connection *cn, struct st_command *command, int flags)
   if (command->type == Q_EVAL || command->type == Q_SEND_EVAL || 
       command->type == Q_EVALP)
   {
-    init_dynamic_string(&eval_query, "", command->query_len+256, 1024);
-    do_eval(&eval_query, command->query, command->end, FALSE);
-    query = eval_query.str;
-    query_len = eval_query.length;
+    if (!command->eval_query.str)
+      init_dynamic_string(&command->eval_query, "", command->query_len + 256,
+                          1024);
+    else
+      dynstr_set(&command->eval_query, 0);
+    do_eval(&command->eval_query, command->query, command->end, FALSE);
+    query= command->eval_query.str;
+    query_len= command->eval_query.length;
   }
   else
   {
@@ -8536,8 +8543,6 @@ void run_query(struct st_connection *cn, struct st_command *command, int flags)
 
   dynstr_free(&ds_warnings);
   ds_warn= 0;
-  if (command->type == Q_EVAL || command->type == Q_SEND_EVAL)
-    dynstr_free(&eval_query);
 
   if (display_result_sorted)
   {
@@ -8941,7 +8946,7 @@ int main(int argc, char **argv)
   my_init_dynamic_array(&q_lines, sizeof(struct st_command*), 1024, 1024, MYF(0));
 
   if (my_hash_init2(&var_hash, 64, charset_info,
-                 128, 0, 0, get_var_key, var_free, MYF(0)))
+                 128, 0, 0, get_var_key, 0, var_free, MYF(0)))
     die("Variable hash initialization failed");
 
   var_set_string("MYSQL_SERVER_VERSION", MYSQL_SERVER_VERSION);

cmake/CPackRPM.cmake

@@ -0,0 +1,16 @@
+#
+# Wrapper for CPackRPM.cmake
+#
+
+# load the original CPackRPM.cmake
+set(orig_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})
+unset(CMAKE_MODULE_PATH)
+include(CPackRPM)
+set(CMAKE_MODULE_PATH ${orig_CMAKE_MODULE_PATH})
+
+# per-component cleanup
+foreach(_RPM_SPEC_HEADER URL REQUIRES SUGGESTS PROVIDES OBSOLETES PREFIX CONFLICTS AUTOPROV AUTOREQ AUTOREQPROV)
+  unset(TMP_RPM_${_RPM_SPEC_HEADER})
+  unset(CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP)
+endforeach()
+

cmake/cpack_rpm.cmake

@@ -23,14 +23,14 @@ SET(CPACK_COMPONENT_SHAREDLIBRARIES_GROUP "shared")
 SET(CPACK_COMPONENT_COMMON_GROUP "common")
 SET(CPACK_COMPONENT_COMPAT_GROUP "compat")
 SET(CPACK_COMPONENTS_ALL Server ManPagesServer IniFiles Server_Scripts
-                                SupportFiles Development ManPagesDevelopment
-                                ManPagesTest Readme ManPagesClient Test 
-                                Common Client SharedLibraries)
+                         SupportFiles Development ManPagesDevelopment
+                         ManPagesTest Readme ManPagesClient Test 
+                         Common Client SharedLibraries)
 
 SET(CPACK_RPM_PACKAGE_NAME "MariaDB")
 SET(CPACK_PACKAGE_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${VERSION}-${RPM}-${CMAKE_SYSTEM_PROCESSOR}")
 
-SET(CPACK_RPM_PACKAGE_RELEASE 1) # FIX: add distribution name here
+SET(CPACK_RPM_PACKAGE_RELEASE "1%{?dist}")
 SET(CPACK_RPM_PACKAGE_LICENSE "GPL")
 SET(CPACK_RPM_PACKAGE_RELOCATABLE FALSE)
 SET(CPACK_RPM_PACKAGE_GROUP "Applications/Databases")
@@ -94,55 +94,128 @@ SET(CPACK_RPM_compat_USER_FILELIST ${ignored})
 SET(CPACK_RPM_devel_USER_FILELIST ${ignored})
 SET(CPACK_RPM_test_USER_FILELIST ${ignored})
 
-SET(CPACK_RPM_client_PACKAGE_OBSOLETES "mysql-client MySQL-client MySQL-OurDelta-client")
-SET(CPACK_RPM_client_PACKAGE_PROVIDES "MySQL-client mysql-client")
+# "set/append array" - append a set of strings, separated by a space
+MACRO(SETA var)
+  FOREACH(v ${ARGN})
+    SET(${var} "${${var}} ${v}")
+  ENDFOREACH()
+ENDMACRO(SETA)
 
-# this is a workaround for CPackRPM.cmake (as of 2.8.8) bug.
-# If a package group does not specify OBSOLETES/REQUIRES the values of the
-# previous (alphabetically) group will apply. 
-SET(CPACK_RPM_common_PACKAGE_OBSOLETES "MySQL-common")
-SET(CPACK_RPM_common_PACKAGE_PROVIDES "MariaDB-common")
+SETA(CPACK_RPM_client_PACKAGE_OBSOLETES
+  "mysql-client"
+  "MySQL-client"
+  "MySQL-OurDelta-client")
+SETA(CPACK_RPM_client_PACKAGE_PROVIDES
+  "MySQL-client"
+  "mysql-client")
 
-SET(CPACK_RPM_devel_PACKAGE_OBSOLETES "mysql-devel MySQL-devel MySQL-OurDelta-devel")
-SET(CPACK_RPM_devel_PACKAGE_PROVIDES "MySQL-devel mysql-devel")
+SETA(CPACK_RPM_devel_PACKAGE_OBSOLETES
+  "MySQL-devel"
+  "MySQL-OurDelta-devel")
+SETA(CPACK_RPM_devel_PACKAGE_PROVIDES
+  "MySQL-devel")
+
+SETA(CPACK_RPM_server_PACKAGE_OBSOLETES
+  "MariaDB"
+  "MySQL"
+  "mysql-server"
+  "MySQL-server"
+  "MySQL-OurDelta-server")
+SETA(CPACK_RPM_server_PACKAGE_PROVIDES
+  "MariaDB"
+  "MySQL"
+  "MySQL-server"
+  "msqlormysql"
+  "mysql-server")
+
+SETA(CPACK_RPM_shared_PACKAGE_OBSOLETES
+  "mysql-shared"
+  "MySQL-shared-standard"
+  "MySQL-shared-pro"
+  "MySQL-shared-pro-cert"
+  "MySQL-shared-pro-gpl"
+  "MySQL-shared-pro-gpl-cert"
+  "MySQL-shared"
+  "MySQL-OurDelta-shared")
+SETA(CPACK_RPM_shared_PACKAGE_PROVIDES
+  "MySQL-shared"
+  "mysql-shared")
+
+SETA(CPACK_RPM_test_PACKAGE_OBSOLETES
+  "MySQL-test"
+  "MySQL-OurDelta-test")
+SETA(CPACK_RPM_test_PACKAGE_PROVIDES
+  "MySQL-test")
 
-SET(CPACK_RPM_server_PACKAGE_OBSOLETES "MariaDB MySQL mysql-server MySQL-server MySQL-OurDelta-server")
-SET(CPACK_RPM_server_PACKAGE_PROVIDES "MariaDB MySQL MySQL-server msqlormysql mysql-server")
 SET(CPACK_RPM_server_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-prein.sh)
 SET(CPACK_RPM_server_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-preun.sh)
 SET(CPACK_RPM_server_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-postin.sh)
 SET(CPACK_RPM_server_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-postun.sh)
-
-SET(CPACK_RPM_shared_PACKAGE_OBSOLETES "mysql-shared MySQL-shared-standard MySQL-shared-pro MySQL-shared-pro-cert MySQL-shared-pro-gpl MySQL-shared-pro-gpl-cert MySQL-shared MySQL-OurDelta-shared mysql-libs")
-SET(CPACK_RPM_shared_PACKAGE_PROVIDES "MySQL-shared mysql-shared")
-
 SET(CPACK_RPM_shared_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/shared-post.sh)
 SET(CPACK_RPM_shared_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/shared-post.sh)
 
-SET(CPACK_RPM_test_PACKAGE_OBSOLETES "mysql-test MySQL-test MySQL-OurDelta-test")
-SET(CPACK_RPM_test_PACKAGE_PROVIDES "MySQL-test mysql-test")
-
-# Argh! Different distributions call packages differently, to be a drop-in replacement
-# we have to fake distribution-speficic dependencies
 MACRO(ALTERNATIVE_NAME real alt)
+  SET(ver "%{version}-%{release}")
+  IF (${epoch})
+    SET(ver "${epoch}:${ver}")
+  ENDIF()
+
   SET(p "CPACK_RPM_${real}_PACKAGE_PROVIDES")
-  SET(${p} "${${p}} ${alt} ${alt}(x86-32) ${alt}(x86-64) config(${alt})")
+  SET(${p} "${${p}} ${alt} = ${ver} ${alt}%{?_isa} = ${ver} config(${alt}) = ${ver}")
   SET(o "CPACK_RPM_${real}_PACKAGE_OBSOLETES")
-  SET(${o} "${${o}} ${alt}")
+  SET(${o} "${${o}} ${alt} ${alt}%{_isa}")
 ENDMACRO(ALTERNATIVE_NAME)
 
+# Argh! Different distributions call packages differently, to be a drop-in
+# replacement we have to fake distribution-speficic dependencies
+
+ALTERNATIVE_NAME("devel"  "mysql-devel")
+ALTERNATIVE_NAME("server" "mysql-server")
+ALTERNATIVE_NAME("test"   "mysql-test")
+
 IF(RPM MATCHES "(rhel|centos)5")
   ALTERNATIVE_NAME("shared" "mysql")
 ELSEIF(RPM MATCHES "(rhel|centos)6")
   ALTERNATIVE_NAME("client" "mysql")
   ALTERNATIVE_NAME("shared" "mysql-libs")
 ELSEIF(RPM MATCHES "fedora")
+  SET(epoch 1) # this is fedora
+  ALTERNATIVE_NAME("client" "mariadb")
   ALTERNATIVE_NAME("client" "mysql")
+  ALTERNATIVE_NAME("devel"  "mariadb-devel")
+  ALTERNATIVE_NAME("server" "mariadb-server")
+  ALTERNATIVE_NAME("shared" "mariadb-libs")
   ALTERNATIVE_NAME("shared" "mysql-libs")
+  ALTERNATIVE_NAME("test"   "mariadb-test")
+  SET(CPACK_RPM_common_PACKAGE_CONFLICTS "mariadb-libs < 1:%{version}-%{release}") 
 ENDIF()
 
 # workaround for lots of perl dependencies added by rpmbuild
-SET(CPACK_RPM_test_PACKAGE_PROVIDES "${CPACK_RPM_test_PACKAGE_PROVIDES} perl(lib::mtr_gcov.pl) perl(lib::mtr_gprof.pl) perl(lib::mtr_io.pl) perl(lib::mtr_misc.pl) perl(lib::mtr_process.pl) perl(lib::v1/mtr_cases.pl) perl(lib::v1/mtr_gcov.pl) perl(lib::v1/mtr_gprof.pl) perl(lib::v1/mtr_im.pl) perl(lib::v1/mtr_io.pl) perl(lib::v1/mtr_match.pl) perl(lib::v1/mtr_misc.pl) perl(lib::v1/mtr_process.pl) perl(lib::v1/mtr_report.pl) perl(lib::v1/mtr_stress.pl) perl(lib::v1/mtr_timer.pl) perl(lib::v1/mtr_unique.pl) perl(mtr_cases) perl(mtr_io.pl) perl(mtr_match) perl(mtr_misc.pl) perl(mtr_report) perl(mtr_results) perl(mtr_unique)")
+SETA(CPACK_RPM_test_PACKAGE_PROVIDES
+  "perl(lib::mtr_gcov.pl)"
+  "perl(lib::mtr_gprof.pl)"
+  "perl(lib::mtr_io.pl)"
+  "perl(lib::mtr_misc.pl)"
+  "perl(lib::mtr_process.pl)"
+  "perl(lib::v1/mtr_cases.pl)"
+  "perl(lib::v1/mtr_gcov.pl)"
+  "perl(lib::v1/mtr_gprof.pl)"
+  "perl(lib::v1/mtr_im.pl)"
+  "perl(lib::v1/mtr_io.pl)"
+  "perl(lib::v1/mtr_match.pl)"
+  "perl(lib::v1/mtr_misc.pl)"
+  "perl(lib::v1/mtr_process.pl)"
+  "perl(lib::v1/mtr_report.pl)"
+  "perl(lib::v1/mtr_stress.pl)"
+  "perl(lib::v1/mtr_timer.pl)"
+  "perl(lib::v1/mtr_unique.pl)"
+  "perl(mtr_cases)"
+  "perl(mtr_io.pl)"
+  "perl(mtr_match)"
+  "perl(mtr_misc.pl)"
+  "perl(mtr_report)"
+  "perl(mtr_results)"
+  "perl(mtr_unique)")
 
 # If we want to build build MariaDB-shared-compat,
 # extract compat libraries from MariaDB-shared-5.3 rpm
@@ -170,7 +243,6 @@ IF (compat_rpm)
   ENDIF()
 ENDIF(compat_rpm)
 
-SET(CPACK_RPM_compat_PACKAGE_REQUIRES "/bin/sh") # to mask CPACK_RPM_PACKAGE_REQUIRES
 SET(CPACK_RPM_compat_PACKAGE_PROVIDES "mysql-libs = 5.3.5") # exact version doesn't matter as long as it greater than 5.1
 SET(CPACK_RPM_compat_PACKAGE_OBSOLETES "mysql-libs < 5.3.5")
 

cmake/install_macros.cmake

@@ -397,6 +397,7 @@ FUNCTION(INSTALL_MYSQL_TEST from to)
       PATTERN "*.vcxproj.filters" EXCLUDE
       PATTERN "*.vcxproj.user" EXCLUDE
       PATTERN "CTest" EXCLUDE
+      PATTERN "*~" EXCLUDE
     )
   ENDIF()
 ENDFUNCTION()

cmake/jemalloc.cmake

@@ -46,13 +46,14 @@ ELSE()
 ENDIF()
 
 SET(WITH_JEMALLOC ${WITH_JEMALLOC_DEFAULT} CACHE STRING
-    "Which jemalloc to use (possible values are 'no', 'bundled', 'system', 'yes' (system if possible, otherwise bundled)")
+    "Which jemalloc to use. Possible values are 'no', 'bundled', 'system', 'yes' (system if possible, otherwise bundled)")
 
 MACRO (CHECK_JEMALLOC)
   IF(WITH_JEMALLOC STREQUAL "system" OR WITH_JEMALLOC STREQUAL "yes")
     CHECK_LIBRARY_EXISTS(jemalloc malloc_stats_print "" HAVE_JEMALLOC)
     IF (HAVE_JEMALLOC)
       SET(LIBJEMALLOC jemalloc)
+      SET(MALLOC_LIBRARY "system jemalloc")
     ELSEIF (WITH_JEMALLOC STREQUAL "system")
       MESSAGE(FATAL_ERROR "system jemalloc is not found")
     ELSEIF (WITH_JEMALLOC STREQUAL "yes")
@@ -61,5 +62,6 @@ MACRO (CHECK_JEMALLOC)
   ENDIF()
   IF(WITH_JEMALLOC STREQUAL "bundled" OR trybundled)
     USE_BUNDLED_JEMALLOC()
+    SET(MALLOC_LIBRARY "bundled jemalloc")
   ENDIF()
 ENDMACRO()

cmake/mysql_add_executable.cmake

@@ -1,48 +1,48 @@
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-# Add executable plus some additional MySQL specific stuff
-# Usage (same as for standard CMake's ADD_EXECUTABLE)
-#
-# MYSQL_ADD_EXECUTABLE(target source1...sourceN)
-#
-# MySQL specifics:
-# - instruct CPack to install executable under ${CMAKE_INSTALL_PREFIX}/bin directory
-# On Windows :
-# - add version resource
-# - instruct CPack to do autenticode signing if SIGNCODE is set
-
-INCLUDE(cmake_parse_arguments)
-
-FUNCTION (MYSQL_ADD_EXECUTABLE)
-  # Pass-through arguments for ADD_EXECUTABLE
-  MYSQL_PARSE_ARGUMENTS(ARG
-   "WIN32;MACOSX_BUNDLE;EXCLUDE_FROM_ALL;DESTINATION;COMPONENT"
-   ""
-   ${ARGN}
-  )
-  LIST(GET ARG_DEFAULT_ARGS 0 target)
-  LIST(REMOVE_AT  ARG_DEFAULT_ARGS 0)
-  
-  SET(sources ${ARG_DEFAULT_ARGS})
-  ADD_VERSION_INFO(${target} EXECUTABLE sources)
-  ADD_EXECUTABLE(${target} ${ARG_WIN32} ${ARG_MACOSX_BUNDLE} ${ARG_EXCLUDE_FROM_ALL} ${sources})
-  # tell CPack where to install
-  IF(NOT ARG_EXCLUDE_FROM_ALL)
-    IF(NOT ARG_DESTINATION)
-      SET(ARG_DESTINATION ${INSTALL_BINDIR})
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+# Add executable plus some additional MySQL specific stuff
+# Usage (same as for standard CMake's ADD_EXECUTABLE)
+#
+# MYSQL_ADD_EXECUTABLE(target source1...sourceN)
+#
+# MySQL specifics:
+# - instruct CPack to install executable under ${CMAKE_INSTALL_PREFIX}/bin directory
+# On Windows :
+# - add version resource
+# - instruct CPack to do autenticode signing if SIGNCODE is set
+
+INCLUDE(cmake_parse_arguments)
+
+FUNCTION (MYSQL_ADD_EXECUTABLE)
+  # Pass-through arguments for ADD_EXECUTABLE
+  MYSQL_PARSE_ARGUMENTS(ARG
+   "WIN32;MACOSX_BUNDLE;EXCLUDE_FROM_ALL;DESTINATION;COMPONENT"
+   ""
+   ${ARGN}
+  )
+  LIST(GET ARG_DEFAULT_ARGS 0 target)
+  LIST(REMOVE_AT  ARG_DEFAULT_ARGS 0)
+  
+  SET(sources ${ARG_DEFAULT_ARGS})
+  ADD_VERSION_INFO(${target} EXECUTABLE sources)
+  ADD_EXECUTABLE(${target} ${ARG_WIN32} ${ARG_MACOSX_BUNDLE} ${ARG_EXCLUDE_FROM_ALL} ${sources})
+  # tell CPack where to install
+  IF(NOT ARG_EXCLUDE_FROM_ALL)
+    IF(NOT ARG_DESTINATION)
+      SET(ARG_DESTINATION ${INSTALL_BINDIR})
     ENDIF()
     IF(ARG_COMPONENT)
       SET(COMP COMPONENT ${ARG_COMPONENT})
@@ -50,7 +50,7 @@ FUNCTION (MYSQL_ADD_EXECUTABLE)
       SET(COMP COMPONENT ${MYSQL_INSTALL_COMPONENT})
     ELSE()
       SET(COMP COMPONENT Client)
-    ENDIF()
-    MYSQL_INSTALL_TARGETS(${target} DESTINATION ${ARG_DESTINATION} ${COMP})
-  ENDIF()
+    ENDIF()
+    MYSQL_INSTALL_TARGETS(${target} DESTINATION ${ARG_DESTINATION} ${COMP})
+  ENDIF()
 ENDFUNCTION()

cmake/pcre.cmake

@@ -0,0 +1,16 @@
+SET(WITH_PCRE "auto" CACHE STRING
+   "Which pcre to use (possible values are 'bundled', 'system', or 'auto')")
+
+MACRO (CHECK_PCRE)
+  IF(WITH_PCRE STREQUAL "system" OR WITH_PCRE STREQUAL "auto")
+    CHECK_LIBRARY_EXISTS(pcre pcre_stack_guard "" HAVE_PCRE)
+  ENDIF()
+  IF(NOT HAVE_PCRE)
+    IF (WITH_PCRE STREQUAL "system")
+      MESSAGE(FATAL_ERROR "system pcre is not found or unusable")
+    ENDIF()
+    SET(PCRE_INCLUDES ${CMAKE_BINARY_DIR}/pcre ${CMAKE_SOURCE_DIR}/pcre)
+    ADD_SUBDIRECTORY(pcre)
+  ENDIF()
+ENDMACRO()
+

cmake/plugin.cmake

@@ -37,8 +37,7 @@ MACRO(MYSQL_ADD_PLUGIN)
   # Add common include directories
   INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include 
                     ${CMAKE_SOURCE_DIR}/sql
-                    ${CMAKE_BINARY_DIR}/pcre
-                    ${CMAKE_SOURCE_DIR}/pcre
+                    ${PCRE_INCLUDES}
                     ${SSL_INCLUDE_DIRS}
                     ${ZLIB_INCLUDE_DIR})
 

cmake/versioninfo.rc.in

@@ -1,38 +1,38 @@
-// Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
-// 
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-#include <windows.h>
-VS_VERSION_INFO VERSIONINFO
-FILEVERSION     @MAJOR_VERSION@,@MINOR_VERSION@,@PATCH_VERSION@,@TINY_VERSION@
-PRODUCTVERSION  @MAJOR_VERSION@,@MINOR_VERSION@,@PATCH_VERSION@,@TINY_VERSION@
-FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
-FILEFLAGS       0
-FILEOS          VOS__WINDOWS32
-FILETYPE        @FILETYPE@
-FILESUBTYPE     VFT2_UNKNOWN
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "FileVersion",      "@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@.@TINY_VERSION@\0"
-            VALUE "ProductVersion",   "@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@.@TINY_VERSION@\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1252
-    END
-END
+// Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; version 2 of the License.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+#include <windows.h>
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION     @MAJOR_VERSION@,@MINOR_VERSION@,@PATCH_VERSION@,@TINY_VERSION@
+PRODUCTVERSION  @MAJOR_VERSION@,@MINOR_VERSION@,@PATCH_VERSION@,@TINY_VERSION@
+FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
+FILEFLAGS       0
+FILEOS          VOS__WINDOWS32
+FILETYPE        @FILETYPE@
+FILESUBTYPE     VFT2_UNKNOWN
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "FileVersion",      "@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@.@TINY_VERSION@\0"
+            VALUE "ProductVersion",   "@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@.@TINY_VERSION@\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1252
+    END
+END

cmake/zlib.cmake

@@ -1,5 +1,4 @@
-# Copyright (c) 2009 Sun Microsystems, Inc.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

config.h.cmake

@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
  
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -618,7 +618,7 @@
 #cmakedefine DEFAULT_CHARSET_HOME "@DEFAULT_CHARSET_HOME@"
 #cmakedefine PLUGINDIR "@PLUGINDIR@"
 #cmakedefine DEFAULT_SYSCONFDIR "@DEFAULT_SYSCONFDIR@"
-#cmakedefine DEFAULT_TMPDIR "@DEFAULT_TMPDIR@"
+#cmakedefine DEFAULT_TMPDIR @DEFAULT_TMPDIR@
 
 #cmakedefine SO_EXT "@CMAKE_SHARED_MODULE_SUFFIX@"
 
@@ -636,10 +636,19 @@
 #define VERSION "@VERSION@"
 #define PROTOCOL_VERSION 10
 
+#define MALLOC_LIBRARY "@MALLOC_LIBRARY@"
 
 /* time_t related defines */
 
 #cmakedefine SIZEOF_TIME_T @SIZEOF_TIME_T@
 #cmakedefine TIME_T_UNSIGNED @TIME_T_UNSIGNED@
 
+#ifdef _AIX
+/*
+  AIX includes inttypes.h from sys/types.h
+  Explicitly request format macros before the first inclusion of inttypes.h
+*/
+#define __STDC_FORMAT_MACROS
+#endif
+
 #endif

dbug/dbug.c

@@ -1642,6 +1642,7 @@ void _db_end_()
 
   cs->stack= &init_settings;
   FreeState(cs, 0);
+  pthread_mutex_destroy(&THR_LOCK_dbug);
   init_done= 0;
 }
 

debian/dist/Debian/mariadb-server-10.0.files.in

@@ -2,7 +2,7 @@ usr/lib/mysql/plugin/auth_pam.so
 usr/lib/mysql/plugin/auth_socket.so
 usr/lib/mysql/plugin/ha_sequence.so
 usr/lib/mysql/plugin/ha_sphinx.so
-usr/lib/mysql/plugin/ha_xtradb.so
+usr/lib/mysql/plugin/ha_innodb.so
 usr/lib/mysql/plugin/handlersocket.so
 usr/lib/mysql/plugin/locales.so
 usr/lib/mysql/plugin/metadata_lock_info.so
@@ -11,6 +11,7 @@ usr/lib/mysql/plugin/query_response_time.so
 usr/lib/mysql/plugin/semisync_master.so
 usr/lib/mysql/plugin/semisync_slave.so
 usr/lib/mysql/plugin/sql_errlog.so
+usr/lib/mysql/plugin/server_audit.so
 usr/lib/libhsclient.so.*
 etc/mysql/debian-start
 etc/mysql/conf.d/mysqld_safe_syslog.cnf

debian/dist/Ubuntu/mariadb-server-10.0.files.in

@@ -2,7 +2,7 @@ usr/lib/mysql/plugin/auth_pam.so
 usr/lib/mysql/plugin/auth_socket.so
 usr/lib/mysql/plugin/ha_sequence.so
 usr/lib/mysql/plugin/ha_sphinx.so
-usr/lib/mysql/plugin/ha_xtradb.so
+usr/lib/mysql/plugin/ha_innodb.so
 usr/lib/mysql/plugin/handlersocket.so
 usr/lib/mysql/plugin/locales.so
 usr/lib/mysql/plugin/metadata_lock_info.so
@@ -11,6 +11,7 @@ usr/lib/mysql/plugin/query_response_time.so
 usr/lib/mysql/plugin/semisync_master.so
 usr/lib/mysql/plugin/semisync_slave.so
 usr/lib/mysql/plugin/sql_errlog.so
+usr/lib/mysql/plugin/server_audit.so
 usr/lib/libhsclient.so.*
 etc/apparmor.d/usr.sbin.mysqld
 usr/share/apport/package-hooks/source_mariadb-10.0.py

debian/po/it.po

@@ -1,8 +1,8 @@
-# Italian (it) translation of debconf templates for mysql-dfsg-5.1
-# Copyright (C) 2009 Software in the Public Interest
-# This file is distributed under the same license as the mysql-dfsg-5.1 package.
-# Luca Monducci <luca.mo@tiscali.it>, 2006 - 2009.
-# 
+# Italian (it) translation of debconf templates for mysql-dfsg-5.1
+# Copyright (C) 2009 Software in the Public Interest
+# This file is distributed under the same license as the mysql-dfsg-5.1 package.
+# Luca Monducci <luca.mo@tiscali.it>, 2006 - 2009.
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1 5.1.37 italian debconf templates\n"

debian/po/sv.po

@@ -1,9 +1,9 @@
-# Translation of mysql-dfsg-5.1 debconf template to Swedish
-# Copyright (C) 2009 Martin Bagge <brother@bsnet.se>
-# This file is distributed under the same license as the mysql-dfsg-5.1 package.
-# 
-# Andreas Henriksson <andreas@fatal.se>, 2007
-# Martin Bagge <brother@bsnet.se>, 2009
+# Translation of mysql-dfsg-5.1 debconf template to Swedish
+# Copyright (C) 2009 Martin Bagge <brother@bsnet.se>
+# This file is distributed under the same license as the mysql-dfsg-5.1 package.
+# 
+# Andreas Henriksson <andreas@fatal.se>, 2007
+# Martin Bagge <brother@bsnet.se>, 2009
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1 5.0.21-3\n"

extra/jemalloc/ChangeLog

@@ -6,6 +6,15 @@ found in the git revision history:
     http://www.canonware.com/cgi-bin/gitweb.cgi?p=jemalloc.git
     git://canonware.com/jemalloc.git
 
+* 3.3.1a (December 27, 2013)
+
+  Bug fixes from 3.4.1
+  - Fix Valgrind integration flaws that caused Valgrind warnings about reads of
+    uninitialized memory in:
+    + arena chunk headers
+    + internal zero-initialized data structures (relevant to tcache and prof
+      code)
+
 * 3.3.1 (March 6, 2013)
 
   This version fixes bugs that are typically encountered only when utilizing

extra/jemalloc/include/jemalloc/internal/arena.h

@@ -441,6 +441,7 @@ void	arena_postfork_child(arena_t *arena);
 #ifndef JEMALLOC_ENABLE_INLINE
 arena_chunk_map_t	*arena_mapp_get(arena_chunk_t *chunk, size_t pageind);
 size_t	*arena_mapbitsp_get(arena_chunk_t *chunk, size_t pageind);
+size_t	arena_mapbitsp_read(size_t *mapbitsp);
 size_t	arena_mapbits_get(arena_chunk_t *chunk, size_t pageind);
 size_t	arena_mapbits_unallocated_size_get(arena_chunk_t *chunk,
     size_t pageind);
@@ -451,6 +452,7 @@ size_t	arena_mapbits_dirty_get(arena_chunk_t *chunk, size_t pageind);
 size_t	arena_mapbits_unzeroed_get(arena_chunk_t *chunk, size_t pageind);
 size_t	arena_mapbits_large_get(arena_chunk_t *chunk, size_t pageind);
 size_t	arena_mapbits_allocated_get(arena_chunk_t *chunk, size_t pageind);
+void	arena_mapbitsp_write(size_t *mapbitsp, size_t mapbits);
 void	arena_mapbits_unallocated_set(arena_chunk_t *chunk, size_t pageind,
     size_t size, size_t flags);
 void	arena_mapbits_unallocated_size_set(arena_chunk_t *chunk, size_t pageind,
@@ -497,11 +499,18 @@ arena_mapbitsp_get(arena_chunk_t *chunk, size_t pageind)
 	return (&arena_mapp_get(chunk, pageind)->bits);
 }
 
+JEMALLOC_ALWAYS_INLINE size_t
+arena_mapbitsp_read(size_t *mapbitsp)
+{
+
+	return (*mapbitsp);
+}
+
 JEMALLOC_ALWAYS_INLINE size_t
 arena_mapbits_get(arena_chunk_t *chunk, size_t pageind)
 {
 
-	return (*arena_mapbitsp_get(chunk, pageind));
+	return (arena_mapbitsp_read(arena_mapbitsp_get(chunk, pageind)));
 }
 
 JEMALLOC_ALWAYS_INLINE size_t
@@ -584,83 +593,90 @@ arena_mapbits_allocated_get(arena_chunk_t *chunk, size_t pageind)
 	return (mapbits & CHUNK_MAP_ALLOCATED);
 }
 
+JEMALLOC_ALWAYS_INLINE void
+arena_mapbitsp_write(size_t *mapbitsp, size_t mapbits)
+{
+
+	*mapbitsp = mapbits;
+}
+
 JEMALLOC_ALWAYS_INLINE void
 arena_mapbits_unallocated_set(arena_chunk_t *chunk, size_t pageind, size_t size,
     size_t flags)
 {
-	size_t *mapbitsp;
+	size_t *mapbitsp = arena_mapbitsp_get(chunk, pageind);
 
-	mapbitsp = arena_mapbitsp_get(chunk, pageind);
 	assert((size & PAGE_MASK) == 0);
 	assert((flags & ~CHUNK_MAP_FLAGS_MASK) == 0);
 	assert((flags & (CHUNK_MAP_DIRTY|CHUNK_MAP_UNZEROED)) == flags);
-	*mapbitsp = size | CHUNK_MAP_BININD_INVALID | flags;
+	arena_mapbitsp_write(mapbitsp, size | CHUNK_MAP_BININD_INVALID | flags);
 }
 
 JEMALLOC_ALWAYS_INLINE void
 arena_mapbits_unallocated_size_set(arena_chunk_t *chunk, size_t pageind,
     size_t size)
 {
-	size_t *mapbitsp;
+	size_t *mapbitsp = arena_mapbitsp_get(chunk, pageind);
+	size_t mapbits = arena_mapbitsp_read(mapbitsp);
 
-	mapbitsp = arena_mapbitsp_get(chunk, pageind);
 	assert((size & PAGE_MASK) == 0);
-	assert((*mapbitsp & (CHUNK_MAP_LARGE|CHUNK_MAP_ALLOCATED)) == 0);
-	*mapbitsp = size | (*mapbitsp & PAGE_MASK);
+	assert((mapbits & (CHUNK_MAP_LARGE|CHUNK_MAP_ALLOCATED)) == 0);
+	arena_mapbitsp_write(mapbitsp, size | (mapbits & PAGE_MASK));
 }
 
 JEMALLOC_ALWAYS_INLINE void
 arena_mapbits_large_set(arena_chunk_t *chunk, size_t pageind, size_t size,
     size_t flags)
 {
-	size_t *mapbitsp;
+	size_t *mapbitsp = arena_mapbitsp_get(chunk, pageind);
+	size_t mapbits = arena_mapbitsp_read(mapbitsp);
 	size_t unzeroed;
 
-	mapbitsp = arena_mapbitsp_get(chunk, pageind);
 	assert((size & PAGE_MASK) == 0);
 	assert((flags & CHUNK_MAP_DIRTY) == flags);
-	unzeroed = *mapbitsp & CHUNK_MAP_UNZEROED; /* Preserve unzeroed. */
-	*mapbitsp = size | CHUNK_MAP_BININD_INVALID | flags | unzeroed |
-	    CHUNK_MAP_LARGE | CHUNK_MAP_ALLOCATED;
+	unzeroed = mapbits & CHUNK_MAP_UNZEROED; /* Preserve unzeroed. */
+	arena_mapbitsp_write(mapbitsp, size | CHUNK_MAP_BININD_INVALID | flags
+	    | unzeroed | CHUNK_MAP_LARGE | CHUNK_MAP_ALLOCATED);
 }
 
 JEMALLOC_ALWAYS_INLINE void
 arena_mapbits_large_binind_set(arena_chunk_t *chunk, size_t pageind,
     size_t binind)
 {
-	size_t *mapbitsp;
+	size_t *mapbitsp = arena_mapbitsp_get(chunk, pageind);
+	size_t mapbits = arena_mapbitsp_read(mapbitsp);
 
 	assert(binind <= BININD_INVALID);
-	mapbitsp = arena_mapbitsp_get(chunk, pageind);
 	assert(arena_mapbits_large_size_get(chunk, pageind) == PAGE);
-	*mapbitsp = (*mapbitsp & ~CHUNK_MAP_BININD_MASK) | (binind <<
-	    CHUNK_MAP_BININD_SHIFT);
+	arena_mapbitsp_write(mapbitsp, (mapbits & ~CHUNK_MAP_BININD_MASK) |
+	    (binind << CHUNK_MAP_BININD_SHIFT));
 }
 
 JEMALLOC_ALWAYS_INLINE void
 arena_mapbits_small_set(arena_chunk_t *chunk, size_t pageind, size_t runind,
     size_t binind, size_t flags)
 {
-	size_t *mapbitsp;
+	size_t *mapbitsp = arena_mapbitsp_get(chunk, pageind);
+	size_t mapbits = arena_mapbitsp_read(mapbitsp);
 	size_t unzeroed;
 
 	assert(binind < BININD_INVALID);
-	mapbitsp = arena_mapbitsp_get(chunk, pageind);
 	assert(pageind - runind >= map_bias);
 	assert((flags & CHUNK_MAP_DIRTY) == flags);
-	unzeroed = *mapbitsp & CHUNK_MAP_UNZEROED; /* Preserve unzeroed. */
-	*mapbitsp = (runind << LG_PAGE) | (binind << CHUNK_MAP_BININD_SHIFT) |
-	    flags | unzeroed | CHUNK_MAP_ALLOCATED;
+	unzeroed = mapbits & CHUNK_MAP_UNZEROED; /* Preserve unzeroed. */
+	arena_mapbitsp_write(mapbitsp, (runind << LG_PAGE) | (binind <<
+	    CHUNK_MAP_BININD_SHIFT) | flags | unzeroed | CHUNK_MAP_ALLOCATED);
 }
 
 JEMALLOC_ALWAYS_INLINE void
 arena_mapbits_unzeroed_set(arena_chunk_t *chunk, size_t pageind,
     size_t unzeroed)
 {
-	size_t *mapbitsp;
+	size_t *mapbitsp = arena_mapbitsp_get(chunk, pageind);
+	size_t mapbits = arena_mapbitsp_read(mapbitsp);
 
-	mapbitsp = arena_mapbitsp_get(chunk, pageind);
-	*mapbitsp = (*mapbitsp & ~CHUNK_MAP_UNZEROED) | unzeroed;
+	arena_mapbitsp_write(mapbitsp, (mapbits & ~CHUNK_MAP_UNZEROED) |
+	    unzeroed);
 }
 
 JEMALLOC_INLINE bool

extra/jemalloc/include/jemalloc/internal/jemalloc_internal.h.in

@@ -235,6 +235,7 @@ static const bool config_ivsalloc =
 #ifdef JEMALLOC_DEBUG
    /* Disable inlining to make debugging easier. */
 #  define JEMALLOC_ALWAYS_INLINE
+#  define JEMALLOC_ALWAYS_INLINE_C static
 #  define JEMALLOC_INLINE
 #  define inline
 #else
@@ -242,8 +243,11 @@ static const bool config_ivsalloc =
 #  ifdef JEMALLOC_HAVE_ATTR
 #    define JEMALLOC_ALWAYS_INLINE \
 	 static inline JEMALLOC_ATTR(unused) JEMALLOC_ATTR(always_inline)
+#    define JEMALLOC_ALWAYS_INLINE_C \
+	 static inline JEMALLOC_ATTR(always_inline)
 #  else
 #    define JEMALLOC_ALWAYS_INLINE static inline
+#    define JEMALLOC_ALWAYS_INLINE_C static inline
 #  endif
 #  define JEMALLOC_INLINE static inline
 #  ifdef _MSC_VER

extra/jemalloc/include/jemalloc/internal/private_namespace.h

@@ -33,6 +33,8 @@
 #define	arena_mapbits_unzeroed_get JEMALLOC_N(arena_mapbits_unzeroed_get)
 #define	arena_mapbits_unzeroed_set JEMALLOC_N(arena_mapbits_unzeroed_set)
 #define	arena_mapbitsp_get JEMALLOC_N(arena_mapbitsp_get)
+#define	arena_mapbitsp_read JEMALLOC_N(arena_mapbitsp_read)
+#define	arena_mapbitsp_write JEMALLOC_N(arena_mapbitsp_write)
 #define	arena_mapp_get JEMALLOC_N(arena_mapp_get)
 #define	arena_maxclass JEMALLOC_N(arena_maxclass)
 #define	arena_new JEMALLOC_N(arena_new)

extra/jemalloc/include/jemalloc/internal/tcache.h

@@ -313,6 +313,7 @@ tcache_alloc_small(tcache_t *tcache, size_t size, bool zero)
 			} else if (opt_zero)
 				memset(ret, 0, size);
 		}
+		VALGRIND_MAKE_MEM_UNDEFINED(ret, size);
 	} else {
 		if (config_fill && opt_junk) {
 			arena_alloc_junk_small(ret, &arena_bin_info[binind],
@@ -321,7 +322,6 @@ tcache_alloc_small(tcache_t *tcache, size_t size, bool zero)
 		VALGRIND_MAKE_MEM_UNDEFINED(ret, size);
 		memset(ret, 0, size);
 	}
-	VALGRIND_MAKE_MEM_UNDEFINED(ret, size);
 
 	if (config_stats)
 		tbin->tstats.nrequests++;
@@ -368,11 +368,11 @@ tcache_alloc_large(tcache_t *tcache, size_t size, bool zero)
 				else if (opt_zero)
 					memset(ret, 0, size);
 			}
+			VALGRIND_MAKE_MEM_UNDEFINED(ret, size);
 		} else {
 			VALGRIND_MAKE_MEM_UNDEFINED(ret, size);
 			memset(ret, 0, size);
 		}
-		VALGRIND_MAKE_MEM_UNDEFINED(ret, size);
 
 		if (config_stats)
 			tbin->tstats.nrequests++;

extra/jemalloc/src/arena.c

@@ -368,14 +368,21 @@ arena_run_zero(arena_chunk_t *chunk, size_t run_ind, size_t npages)
 	    (npages << LG_PAGE));
 }
 
+static inline void
+arena_run_page_mark_zeroed(arena_chunk_t *chunk, size_t run_ind)
+{
+
+	VALGRIND_MAKE_MEM_DEFINED((void *)((uintptr_t)chunk + (run_ind <<
+	    LG_PAGE)), PAGE);
+}
+
 static inline void
 arena_run_page_validate_zeroed(arena_chunk_t *chunk, size_t run_ind)
 {
 	size_t i;
 	UNUSED size_t *p = (size_t *)((uintptr_t)chunk + (run_ind << LG_PAGE));
 
-	VALGRIND_MAKE_MEM_DEFINED((void *)((uintptr_t)chunk + (run_ind <<
-	    LG_PAGE)), PAGE);
+	arena_run_page_mark_zeroed(chunk, run_ind);
 	for (i = 0; i < PAGE / sizeof(size_t); i++)
 		assert(p[i] == 0);
 }
@@ -458,6 +465,9 @@ arena_run_split(arena_t *arena, arena_run_t *run, size_t size, bool large,
 					} else if (config_debug) {
 						arena_run_page_validate_zeroed(
 						    chunk, run_ind+i);
+					} else {
+						arena_run_page_mark_zeroed(
+						    chunk, run_ind+i);
 					}
 				}
 			} else {
@@ -467,6 +477,9 @@ arena_run_split(arena_t *arena, arena_run_t *run, size_t size, bool large,
 				 */
 				arena_run_zero(chunk, run_ind, need_pages);
 			}
+		} else {
+			VALGRIND_MAKE_MEM_UNDEFINED((void *)((uintptr_t)chunk +
+			    (run_ind << LG_PAGE)), (need_pages << LG_PAGE));
 		}
 
 		/*
@@ -508,9 +521,9 @@ arena_run_split(arena_t *arena, arena_run_t *run, size_t size, bool large,
 			arena_run_page_validate_zeroed(chunk,
 			    run_ind+need_pages-1);
 		}
+		VALGRIND_MAKE_MEM_UNDEFINED((void *)((uintptr_t)chunk +
+		    (run_ind << LG_PAGE)), (need_pages << LG_PAGE));
 	}
-	VALGRIND_MAKE_MEM_UNDEFINED((void *)((uintptr_t)chunk + (run_ind <<
-	    LG_PAGE)), (need_pages << LG_PAGE));
 }
 
 static arena_chunk_t *
@@ -569,17 +582,24 @@ arena_chunk_alloc(arena_t *arena)
 		 * unless the chunk is not zeroed.
 		 */
 		if (zero == false) {
+			VALGRIND_MAKE_MEM_UNDEFINED(
+			    (void *)arena_mapp_get(chunk, map_bias+1),
+			    (size_t)((uintptr_t) arena_mapp_get(chunk,
+			    chunk_npages-1) - (uintptr_t)arena_mapp_get(chunk,
+			    map_bias+1)));
 			for (i = map_bias+1; i < chunk_npages-1; i++)
 				arena_mapbits_unzeroed_set(chunk, i, unzeroed);
-		} else if (config_debug) {
+		} else {
 			VALGRIND_MAKE_MEM_DEFINED(
 			    (void *)arena_mapp_get(chunk, map_bias+1),
-			    (void *)((uintptr_t)
-			    arena_mapp_get(chunk, chunk_npages-1)
-			    - (uintptr_t)arena_mapp_get(chunk, map_bias+1)));
-			for (i = map_bias+1; i < chunk_npages-1; i++) {
-				assert(arena_mapbits_unzeroed_get(chunk, i) ==
-				    unzeroed);
+			    (size_t)((uintptr_t) arena_mapp_get(chunk,
+			    chunk_npages-1) - (uintptr_t)arena_mapp_get(chunk,
+			    map_bias+1)));
+			if (config_debug) {
+				for (i = map_bias+1; i < chunk_npages-1; i++) {
+					assert(arena_mapbits_unzeroed_get(chunk,
+					    i) == unzeroed);
+				}
 			}
 		}
 		arena_mapbits_unallocated_set(chunk, chunk_npages-1,
@@ -1458,6 +1478,7 @@ arena_malloc_small(arena_t *arena, size_t size, bool zero)
 			} else if (opt_zero)
 				memset(ret, 0, size);
 		}
+		VALGRIND_MAKE_MEM_UNDEFINED(ret, size);
 	} else {
 		if (config_fill && opt_junk) {
 			arena_alloc_junk_small(ret, &arena_bin_info[binind],
@@ -1466,7 +1487,6 @@ arena_malloc_small(arena_t *arena, size_t size, bool zero)
 		VALGRIND_MAKE_MEM_UNDEFINED(ret, size);
 		memset(ret, 0, size);
 	}
-	VALGRIND_MAKE_MEM_UNDEFINED(ret, size);
 
 	return (ret);
 }

extra/replace.c

@@ -265,7 +265,7 @@ static int insert_pointer_name(reg1 POINTER_ARRAY *pa,char * name)
     if (!(pa->str= (uchar*) my_malloc((uint) (PS_MALLOC-MALLOC_OVERHEAD),
 				     MYF(MY_WME))))
     {
-      my_free((char*) pa->typelib.type_names);
+      my_free((void*) pa->typelib.type_names);
       DBUG_RETURN (-1);
     }
     pa->max_count=(PC_MALLOC-MALLOC_OVERHEAD)/(sizeof(uchar*)+
@@ -327,7 +327,7 @@ static void free_pointer_array(reg1 POINTER_ARRAY *pa)
   if (pa->typelib.count)
   {
     pa->typelib.count=0;
-    my_free((char*) pa->typelib.type_names);
+    my_free((void*) pa->typelib.type_names);
     pa->typelib.type_names=0;
     my_free(pa->str);
   }

extra/yassl/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

extra/yassl/include/yassl_error.hpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

extra/yassl/include/yassl_types.hpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

extra/yassl/src/handshake.cpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates.
+   Copyright (c) 2005, 2013, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

extra/yassl/src/yassl_error.cpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates
+   Copyright (c) 2005, 2013, Oracle and/or its affiliates
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

extra/yassl/src/yassl_imp.cpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates
+   Copyright (c) 2005, 2013, Oracle and/or its affiliates
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

extra/yassl/taocrypt/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

include/atomic/gcc_builtins.h

@@ -31,6 +31,12 @@
 #define make_atomic_store_body(S)  *a= v
 #define MY_ATOMIC_MODE "gcc-builtins-up"
 
+#elif defined(__ATOMIC_SEQ_CST)
+#define MY_ATOMIC_MODE "gcc-builtins-smp"
+#define make_atomic_load_body(S)                    \
+  ret= __atomic_load_n(a, __ATOMIC_SEQ_CST)
+#define make_atomic_store_body(S)                   \
+  __atomic_store_n(a, v, __ATOMIC_SEQ_CST)
 #else
 #define MY_ATOMIC_MODE "gcc-builtins-smp"
 #define make_atomic_load_body(S)                    \

include/hash.h

@@ -44,6 +44,8 @@ extern "C" {
 
 typedef uint my_hash_value_type;
 typedef uchar *(*my_hash_get_key)(const uchar *,size_t*,my_bool);
+typedef my_hash_value_type (*my_hash_function)(const CHARSET_INFO *,
+                                               const uchar *, size_t);
 typedef void (*my_hash_free_key)(void *);
 typedef my_bool (*my_hash_walk_action)(void *,void *);
 
@@ -54,6 +56,7 @@ typedef struct st_hash {
   uint flags;
   DYNAMIC_ARRAY array;				/* Place for hash_keys */
   my_hash_get_key get_key;
+  my_hash_function hash_function;
   void (*free)(void *);
   CHARSET_INFO *charset;
 } HASH;
@@ -61,10 +64,11 @@ typedef struct st_hash {
 /* A search iterator state */
 typedef uint HASH_SEARCH_STATE;
 
-#define my_hash_init(A,B,C,D,E,F,G,H) my_hash_init2(A,0,B,C,D,E,F,G,H)
+#define my_hash_init(A,B,C,D,E,F,G,H) my_hash_init2(A,0,B,C,D,E,F,0,G,H)
 my_bool my_hash_init2(HASH *hash, uint growth_size, CHARSET_INFO *charset,
                       ulong default_array_elements, size_t key_offset,
                       size_t key_length, my_hash_get_key get_key,
+                      my_hash_function hash_function,
                       void (*free_element)(void*),
                       uint flags);
 void my_hash_free(HASH *tree);
@@ -74,8 +78,9 @@ uchar *my_hash_search(const HASH *info, const uchar *key, size_t length);
 uchar *my_hash_search_using_hash_value(const HASH *info,
                                        my_hash_value_type hash_value,
                                        const uchar *key, size_t length);
-my_hash_value_type my_calc_hash(const HASH *info,
+my_hash_value_type my_hash_sort(const CHARSET_INFO *cs,
                                 const uchar *key, size_t length);
+#define my_calc_hash(A, B, C) my_hash_sort((A)->charset, B, C)
 uchar *my_hash_first(const HASH *info, const uchar *key, size_t length,
                      HASH_SEARCH_STATE *state);
 uchar *my_hash_first_from_hash_value(const HASH *info,

include/heap.h

@@ -102,8 +102,8 @@ typedef struct st_heap_block
   HP_PTRS *root;                        /* Top-level block */ 
   struct st_level_info level_info[HP_MAX_LEVELS+1];
   uint levels;                          /* number of used levels */
-  uint records_in_block;		/* Records in one heap-block */
   uint recbuffer;			/* Length of one saved record */
+  ulong records_in_block;		/* Records in one heap-block */
   ulong last_allocated; /* number of records there is allocated space for */
 } HP_BLOCK;
 
@@ -134,14 +134,15 @@ typedef struct st_heap_share
 {
   HP_BLOCK block;
   HP_KEYDEF  *keydef;
-  ulong min_records,max_records;	/* Params to open */
   ulonglong data_length,index_length,max_table_size;
+  ulonglong auto_increment;
+  ulong min_records,max_records;	/* Params to open */
+  ulong records;			/* records */
+  ulong blength;			/* records rounded up to 2^n */
+  ulong deleted;			/* Deleted records in database */
   uint key_stat_version;                /* version to indicate insert/delete */
   uint key_version;                     /* Updated on key change */
   uint file_version;                    /* Update on clear */
-  uint records;				/* records */
-  uint blength;				/* records rounded up to 2^n */
-  uint deleted;				/* Deleted records in database */
   uint reclength;			/* Length of one record */
   uint changed;
   uint keys,max_key_length;
@@ -157,7 +158,6 @@ typedef struct st_heap_share
   LIST open_list;
   uint auto_key;
   uint auto_key_type;			/* real type of the auto key segment */
-  ulonglong auto_increment;
 } HP_SHARE;
 
 struct st_hp_hash_info;
@@ -188,12 +188,12 @@ typedef struct st_heap_info
 typedef struct st_heap_create_info
 {
   HP_KEYDEF *keydef;
-  ulong max_records;
-  ulong min_records;
   uint auto_key;                        /* keynr [1 - maxkey] for auto key */
   uint auto_key_type;
   uint keys;
   uint reclength;
+  ulong max_records;
+  ulong min_records;
   ulonglong max_table_size;
   ulonglong auto_increment;
   my_bool with_auto_increment;

include/ma_dyncol.h

@@ -220,6 +220,9 @@ mariadb_dyncol_unpack(DYNAMIC_COLUMN *str,
                       uint *count,
                       MYSQL_LEX_STRING **names, DYNAMIC_COLUMN_VALUE **vals);
 
+void mariadb_dyncol_unpack_free(MYSQL_LEX_STRING *names,
+                                DYNAMIC_COLUMN_VALUE *vals);
+
 int mariadb_dyncol_column_cmp_named(const MYSQL_LEX_STRING *s1,
                                     const MYSQL_LEX_STRING *s2);
 

include/maria.h

@@ -69,8 +69,8 @@ extern "C" {
 #if MARIA_MAX_KEY > MARIA_KEYMAP_BITS
 #define maria_is_key_active(_keymap_,_keyno_) \
                             (((_keyno_) < MARIA_KEYMAP_BITS) ? \
-                             test((_keymap_) & (1ULL << (_keyno_))) : \
-                             test((_keymap_) & MARIA_KEYMAP_HIGH_MASK))
+                             MY_TEST((_keymap_) & (1ULL << (_keyno_))) : \
+                             MY_TEST((_keymap_) & MARIA_KEYMAP_HIGH_MASK))
 #define maria_set_key_active(_keymap_,_keyno_) \
                             (_keymap_)|= (((_keyno_) < MARIA_KEYMAP_BITS) ? \
                                           (1ULL << (_keyno_)) : \
@@ -81,14 +81,14 @@ extern "C" {
                                           (~ (0ULL)) /*ignore*/ )
 #else
 #define maria_is_key_active(_keymap_,_keyno_) \
-                            test((_keymap_) & (1ULL << (_keyno_)))
+                            MY_TEST((_keymap_) & (1ULL << (_keyno_)))
 #define maria_set_key_active(_keymap_,_keyno_) \
                             (_keymap_)|= (1ULL << (_keyno_))
 #define maria_clear_key_active(_keymap_,_keyno_) \
                             (_keymap_)&= (~ (1ULL << (_keyno_)))
 #endif
 #define maria_is_any_key_active(_keymap_) \
-                            test((_keymap_))
+                            MY_TEST((_keymap_))
 #define maria_is_all_keys_active(_keymap_,_keys_) \
                             ((_keymap_) == maria_get_mask_all_keys_active(_keys_))
 #define maria_set_all_keys_active(_keymap_,_keys_) \

include/my_bitmap.h

@@ -41,9 +41,14 @@ typedef struct st_bitmap
 #ifdef	__cplusplus
 extern "C" {
 #endif
+
+/* compatibility functions */
+#define bitmap_init(A,B,C,D) my_bitmap_init(A,B,C,D)
+#define bitmap_free(A) my_bitmap_free(A)
+
 extern void create_last_word_mask(MY_BITMAP *map);
-extern my_bool bitmap_init(MY_BITMAP *map, my_bitmap_map *buf, uint n_bits,
-                           my_bool thread_safe);
+extern my_bool my_bitmap_init(MY_BITMAP *map, my_bitmap_map *buf, uint n_bits,
+                              my_bool thread_safe);
 extern my_bool bitmap_is_clear_all(const MY_BITMAP *map);
 extern my_bool bitmap_is_prefix(const MY_BITMAP *map, uint prefix_size);
 extern my_bool bitmap_is_set_all(const MY_BITMAP *map);
@@ -64,7 +69,7 @@ extern uint bitmap_get_first(const MY_BITMAP *map);
 extern uint bitmap_get_first_set(const MY_BITMAP *map);
 extern uint bitmap_bits_set(const MY_BITMAP *map);
 extern uint bitmap_get_next_set(const MY_BITMAP *map, uint bitmap_bit);
-extern void bitmap_free(MY_BITMAP *map);
+extern void my_bitmap_free(MY_BITMAP *map);
 extern void bitmap_set_above(MY_BITMAP *map, uint from_byte, uint use_bit);
 extern void bitmap_set_prefix(MY_BITMAP *map, uint prefix_size);
 extern void bitmap_intersect(MY_BITMAP *map, const MY_BITMAP *map2);

include/my_getopt.h

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2002, 2012, Oracle and/or its affiliates.
+   Copyright (c) 2002, 2013, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

include/my_global.h

@@ -144,6 +144,7 @@
 /* Workaround for _LARGE_FILES and _LARGE_FILE_API incompatibility on AIX */
 #if defined(_AIX) && defined(_LARGE_FILE_API)
 #undef _LARGE_FILE_API
+#undef __GNUG__
 #endif
 
 /*
@@ -264,6 +265,16 @@
 #endif
 #endif
 
+
+#ifdef _AIX
+/*
+  AIX includes inttypes.h from sys/types.h
+  Explicitly request format macros before the first inclusion of inttypes.h
+*/
+#define __STDC_FORMAT_MACROS  
+#endif
+
+
 #if !defined(__WIN__)
 #ifndef _POSIX_PTHREAD_SEMANTICS
 #define _POSIX_PTHREAD_SEMANTICS /* We want posix threads */
@@ -316,6 +327,13 @@ C_MODE_END
 #define _LONG_LONG 1		/* For AIX string library */
 #endif
 
+/* Workaround for _LARGE_FILES and _LARGE_FILE_API incompatibility on AIX */
+#if defined(_AIX) && defined(_LARGE_FILE_API)
+#undef _LARGE_FILE_API
+#undef __GNUG__
+#endif
+
+
 #ifndef stdin
 #include <stdio.h>
 #endif
@@ -341,6 +359,14 @@ C_MODE_END
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
+
+/* Workaround for _LARGE_FILES and _LARGE_FILE_API incompatibility on AIX */
+#if defined(_AIX) && defined(_LARGE_FILE_API)
+#undef _LARGE_FILE_API
+#undef __GNUG__
+#endif
+
+
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
@@ -474,7 +500,7 @@ typedef unsigned short ushort;
 #endif
 
 #define swap_variables(t, a, b) do { t dummy; dummy= a; a= b; b= dummy; } while(0)
-#define test(a)		((a) ? 1 : 0)
+#define MY_TEST(a) ((a) ? 1 : 0)
 #define set_if_bigger(a,b)  do { if ((a) < (b)) (a)=(b); } while(0)
 #define set_if_smaller(a,b) do { if ((a) > (b)) (a)=(b); } while(0)
 #define set_bits(type, bit_count) (sizeof(type)*8 <= (bit_count) ? ~(type) 0 : ((((type) 1) << (bit_count)) - (type) 1))
@@ -1214,11 +1240,10 @@ static inline double rint(double x)
 #define HAVE_EXTERNAL_CLIENT
 #endif /* EMBEDDED_LIBRARY */
 
-/*
-  Define default tmpdir if not already set.
-*/
-#if !defined(DEFAULT_TMPDIR)
-#define DEFAULT_TMPDIR P_tmpdir
+/* Workaround for _LARGE_FILES and _LARGE_FILE_API incompatibility on AIX */
+#if defined(_AIX) && defined(_LARGE_FILE_API)
+#undef _LARGE_FILE_API
+#undef __GNUG__
 #endif
 
 #endif /* my_global_h */

include/my_net.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

include/my_pthread.h

@@ -1,5 +1,5 @@
-/* Copyright (C) 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc,
-   2010-2011 Oracle and/or its affiliates, 2009-2010 Monty Program Ab.
+/* Copyright (c) 2000, 2013, Oracle and/or its affiliates.
+   Copyright (c) 2009, 2013, Monty Program Ab.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -96,7 +96,7 @@ int pthread_create(pthread_t *, const pthread_attr_t *, pthread_handler, void *)
 int pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr);
 int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex);
 int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
-			   struct timespec *abstime);
+			   const struct timespec *abstime);
 int pthread_cond_signal(pthread_cond_t *cond);
 int pthread_cond_broadcast(pthread_cond_t *cond);
 int pthread_cond_destroy(pthread_cond_t *cond);

include/my_sys.h

@@ -782,8 +782,9 @@ extern my_bool real_open_cached_file(IO_CACHE *cache);
 extern void close_cached_file(IO_CACHE *cache);
 File create_temp_file(char *to, const char *dir, const char *pfx,
 		      int mode, myf MyFlags);
-#define my_init_dynamic_array(A,B,C,D,E) my_init_dynamic_array2(A,B,NULL,C,D,E)
-extern my_bool my_init_dynamic_array2(DYNAMIC_ARRAY *array, uint element_size,
+#define my_init_dynamic_array(A,B,C,D,E) init_dynamic_array2(A,B,NULL,C,D,E)
+#define my_init_dynamic_array2(A,B,C,D,E,F) init_dynamic_array2(A,B,C,D,E,F)
+extern my_bool init_dynamic_array2(DYNAMIC_ARRAY *array, uint element_size,
                                    void *init_buffer, uint init_alloc,
                                    uint alloc_increment, myf my_flags);
 extern my_bool insert_dynamic(DYNAMIC_ARRAY *array, const void* element);

include/my_time.h

@@ -74,8 +74,11 @@ extern uchar days_in_month[];
 #define MYSQL_TIME_WARN_WARNINGS (MYSQL_TIME_WARN_TRUNCATED|MYSQL_TIME_WARN_OUT_OF_RANGE)
 #define MYSQL_TIME_WARN_NOTES    (MYSQL_TIME_NOTE_TRUNCATED)
 
-#define MYSQL_TIME_WARN_HAVE_WARNINGS(x) test((x) & MYSQL_TIME_WARN_WARNINGS)
-#define MYSQL_TIME_WARN_HAVE_NOTES(x) test((x) & MYSQL_TIME_WARN_NOTES)
+#define MYSQL_TIME_WARN_HAVE_WARNINGS(x) MY_TEST((x) & MYSQL_TIME_WARN_WARNINGS)
+#define MYSQL_TIME_WARN_HAVE_NOTES(x) MY_TEST((x) & MYSQL_TIME_WARN_NOTES)
+
+/* Usefull constants */
+#define SECONDS_IN_24H 86400L
 
 /* Limits for the TIME data type */
 #define TIME_MAX_HOUR 838

include/my_valgrind.h

@@ -13,10 +13,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-
-/* Some defines to make it easier to use valgrind */
-#include <m_string.h>           /* bfill */
-
 #ifdef HAVE_valgrind
 #define IF_VALGRIND(A,B) A
 #else
@@ -37,7 +33,7 @@
 #endif /* HAVE_VALGRIND */
 
 #ifndef DBUG_OFF
-#define TRASH_FILL(A,B,C) do { const size_t trash_tmp= (B) ; bfill(A, trash_tmp, C); MEM_UNDEFINED(A, trash_tmp); } while (0)
+#define TRASH_FILL(A,B,C) do { const size_t trash_tmp= (B); memset(A, C, trash_tmp); MEM_UNDEFINED(A, trash_tmp); } while (0)
 #else
 #define TRASH_FILL(A,B,C) do{ const size_t trash_tmp __attribute__((unused)) = (B) ; MEM_CHECK_ADDRESSABLE(A,trash_tmp);MEM_UNDEFINED(A,trash_tmp);} while (0)
 #endif

include/myisam.h

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates.
+   Copyright (c) 2000, 2013, Oracle and/or its affiliates.
    Copyright (c) 2009, 2013, Monty Program Ab.
 
    This program is free software; you can redistribute it and/or modify
@@ -68,8 +68,8 @@ extern "C" {
 
 #define mi_is_key_active(_keymap_,_keyno_) \
                             (((_keyno_) < MI_KEYMAP_BITS) ? \
-                             test((_keymap_) & (1ULL << (_keyno_))) : \
-                             test((_keymap_) & MI_KEYMAP_HIGH_MASK))
+                             MY_TEST((_keymap_) & (1ULL << (_keyno_))) : \
+                             MY_TEST((_keymap_) & MI_KEYMAP_HIGH_MASK))
 #define mi_set_key_active(_keymap_,_keyno_) \
                             (_keymap_)|= (((_keyno_) < MI_KEYMAP_BITS) ? \
                                           (1ULL << (_keyno_)) : \
@@ -82,7 +82,7 @@ extern "C" {
 #else
 
 #define mi_is_key_active(_keymap_,_keyno_) \
-                            test((_keymap_) & (1ULL << (_keyno_)))
+                            MY_TEST((_keymap_) & (1ULL << (_keyno_)))
 #define mi_set_key_active(_keymap_,_keyno_) \
                             (_keymap_)|= (1ULL << (_keyno_))
 #define mi_clear_key_active(_keymap_,_keyno_) \
@@ -91,7 +91,7 @@ extern "C" {
 #endif
 
 #define mi_is_any_key_active(_keymap_) \
-                            test((_keymap_))
+                            MY_TEST((_keymap_))
 #define mi_is_all_keys_active(_keymap_,_keys_) \
                             ((_keymap_) == mi_get_mask_all_keys_active(_keys_))
 #define mi_set_all_keys_active(_keymap_,_keys_) \

include/mysql/plugin.h

@@ -1,5 +1,5 @@
-/* Copyright (c) 2005, 2011, Oracle and/or its affiliates
-   Copyright (C) 2009, 2011, Monty Program Ab
+/* Copyright (c) 2005, 2013, Oracle and/or its affiliates
+   Copyright (C) 2009, 2013, Monty Program Ab
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -622,6 +622,7 @@ void **thd_ha_data(const MYSQL_THD thd, const struct handlerton *hton);
 void thd_storage_lock_wait(MYSQL_THD thd, long long value);
 int thd_tx_isolation(const MYSQL_THD thd);
 int thd_tx_is_read_only(const MYSQL_THD thd);
+int thd_rpl_is_parallel(const MYSQL_THD thd);
 /**
   Create a temporary file.
 

include/mysql/plugin_audit.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License

include/mysql/plugin_audit.h.pp

@@ -303,6 +303,7 @@ void **thd_ha_data(const void* thd, const struct handlerton *hton);
 void thd_storage_lock_wait(void* thd, long long value);
 int thd_tx_isolation(const void* thd);
 int thd_tx_is_read_only(const void* thd);
+int thd_rpl_is_parallel(const void* thd);
 int mysql_tmpfile(const char *prefix);
 unsigned long thd_get_thread_id(const void* thd);
 void thd_get_xid(const void* thd, MYSQL_XID *xid);

include/mysql/plugin_auth.h.pp

@@ -303,6 +303,7 @@ void **thd_ha_data(const void* thd, const struct handlerton *hton);
 void thd_storage_lock_wait(void* thd, long long value);
 int thd_tx_isolation(const void* thd);
 int thd_tx_is_read_only(const void* thd);
+int thd_rpl_is_parallel(const void* thd);
 int mysql_tmpfile(const char *prefix);
 unsigned long thd_get_thread_id(const void* thd);
 void thd_get_xid(const void* thd, MYSQL_XID *xid);

include/mysql/plugin_ftparser.h.pp

@@ -256,6 +256,7 @@ void **thd_ha_data(const void* thd, const struct handlerton *hton);
 void thd_storage_lock_wait(void* thd, long long value);
 int thd_tx_isolation(const void* thd);
 int thd_tx_is_read_only(const void* thd);
+int thd_rpl_is_parallel(const void* thd);
 int mysql_tmpfile(const char *prefix);
 unsigned long thd_get_thread_id(const void* thd);
 void thd_get_xid(const void* thd, MYSQL_XID *xid);

include/mysql/psi/mysql_thread.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2013, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -66,6 +66,7 @@
   An instrumented mutex structure.
   @sa mysql_mutex_t
 */
+
 struct st_mysql_mutex
 {
   /** The real mutex. */
@@ -96,6 +97,15 @@ struct st_mysql_mutex
 */
 typedef struct st_mysql_mutex mysql_mutex_t;
 
+/* How to access the pthread_mutex in mysql_mutex_t */
+#ifdef SAFE_MUTEX
+#define mysql_mutex_real_mutex(A) &(A)->m_mutex.mutex
+#elif defined(MY_PTHREAD_FASTMUTEX)
+#define mysql_mutex_real_mutex(A) &(A)->m_mutex.mutex
+#else
+#define mysql_mutex_real_mutex(A) &(A)->m_mutex
+#endif
+
 /**
   An instrumented rwlock structure.
   @sa mysql_rwlock_t
@@ -1170,7 +1180,7 @@ static inline int inline_mysql_cond_wait(
 static inline int inline_mysql_cond_timedwait(
   mysql_cond_t *that,
   mysql_mutex_t *mutex,
-  struct timespec *abstime
+  const struct timespec *abstime
 #ifdef HAVE_PSI_COND_INTERFACE
   , const char *src_file, uint src_line
 #endif

include/queues.h

@@ -51,6 +51,7 @@ typedef struct st_queue {
 
 #define queue_first_element(queue) 1
 #define queue_last_element(queue) (queue)->elements
+#define queue_empty(queue) ((queue)->elements == 0)
 #define queue_top(queue) ((queue)->root[1])
 #define queue_element(queue,index) ((queue)->root[index])
 #define queue_end(queue) ((queue)->root[(queue)->elements])

include/welcome_copyright_notice.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, 2012, Oracle and/or its affiliates.
+/* Copyright (c) 2011, 2014, Oracle and/or its affiliates.
    Copyright (c) 2011, 2012, Monty Program Ab
 
    This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
 #ifndef _welcome_copyright_notice_h_
 #define _welcome_copyright_notice_h_
 
-#define COPYRIGHT_NOTICE_CURRENT_YEAR "2013"
+#define COPYRIGHT_NOTICE_CURRENT_YEAR "2014"
 
 /*
   This define specifies copyright notice which is displayed by every MySQL
@@ -25,6 +25,6 @@
 */
 #define ORACLE_WELCOME_COPYRIGHT_NOTICE(first_year) \
   "Copyright (c) " first_year ", " COPYRIGHT_NOTICE_CURRENT_YEAR \
-   ", Oracle, Monty Program Ab and others.\n"
+   ", Oracle, SkySQL Ab and others.\n"
 
 #endif /* _welcome_copyright_notice_h_ */

libmysql/CMakeLists.txt

@@ -1,4 +1,5 @@
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates.
+# Copyright (c) 2006, 2013, Oracle and/or its affiliates.
+# Copyright (c) 2009, 2013, SkySQL Ab.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,8 +17,7 @@
 INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/include
   ${CMAKE_SOURCE_DIR}/libmysql
-  ${CMAKE_BINARY_DIR}/pcre
-  ${CMAKE_SOURCE_DIR}/pcre
+  ${PCRE_INCLUDES}
   ${CMAKE_SOURCE_DIR}/strings
   ${SSL_INCLUDE_DIRS}
   ${SSL_INTERNAL_INCLUDE_DIRS}
@@ -26,8 +26,6 @@ ADD_DEFINITIONS(${SSL_DEFINES})
 
 SET(CLIENT_API_FUNCTIONS_5_1
 get_tty_password
-handle_options
-load_defaults
 mysql_thread_end
 mysql_thread_init
 myodbc_remove_escape
@@ -131,6 +129,12 @@ mysql_server_init
 mysql_server_end
 mysql_set_character_set
 mysql_get_character_set_info
+# These are documented in Paul DuBois' MySQL book,
+# so we treat them as part of the de-facto API.
+handle_options
+load_defaults
+free_defaults
+my_print_help
 )
 
 SET(CLIENT_API_FUNCTIONS_5_5
@@ -153,6 +157,8 @@ mysql_close_cont
 mysql_close_start
 mysql_commit_cont
 mysql_commit_start
+mysql_dump_debug_info_cont
+mysql_dump_debug_info_start
 mysql_fetch_row_cont
 mysql_fetch_row_start
 mysql_free_result_cont
@@ -242,6 +248,7 @@ mariadb_dyncol_val_str
 mariadb_dyncol_val_long
 mariadb_dyncol_val_double
 mariadb_dyncol_unpack
+mariadb_dyncol_unpack_free
 mariadb_dyncol_column_cmp_named
 mariadb_dyncol_column_count
 mariadb_dyncol_prepare_decimal
@@ -259,73 +266,114 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
   # for compatibility with distribution packages, so client shared library can 
   # painlessly replace the one supplied by the distribution.
   
-  # Also list of exported symbols in distributions may differ from what is considered
-  # official API. Define CLIENT_API_EXTRA for the set of symbols, that required to
-  # be exported on different platforms.
+  # Also list of exported symbols in distributions may differ from what is
+  # considered official API. Define CLIENT_API_5_1_EXTRA for the set of
+  # symbols, that required to be exported on different platforms.
   
-  IF(RPM)
-    # Fedora & Co declared following functions as part of API 
-    SET(CLIENT_API_EXTRA
-      mysql_default_charset_info
-      mysql_get_charset
-      mysql_get_charset_by_csname
-      mysql_net_realloc
-      mysql_client_errors
+  # Fedora & Co declared following functions as part of API 
+  SET(CLIENT_API_5_1_EXTRA
+    # why does Fedora export these?
+    _fini
+    _init
+    my_init
 
-      #  Also export the non-renamed variants
-      # (in case someone wants to rebuild mysqli-php or something similar)
-      # See MDEV-4127
-      default_charset_info
-      get_charset
-      get_charset_by_csname
-      net_realloc
-      client_errors
-      THR_KEY_mysys
-    )  
-  
-    # Add special script to fix symbols renames by Fedora
-    SET(CLIENT_SOURCES_EXTRA rpm_support.cc)
-    SET(VERSION_SCRIPT_TEMPLATE 
-    ${CMAKE_CURRENT_SOURCE_DIR}/libmysql_rpm_version.in)	  
-  ELSEIF(DEB)
-    # libmyodbc on Ubuntu is using functions below
-    # If we don't export them, linker would just remove 
-    # them (they are not used inside libmysqlclient)
-    SET(CLIENT_API_EXTRA
-      strfill
-      init_dynamic_string
-    )
-    # MySQL supplied with Ubuntu does not have versioning, bug Debian does.
-    IF(DEB MATCHES "debian") 
-      SET(VERSION_SCRIPT_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/libmysql.ver.in)
-    ENDIF()
-  ENDIF()
+    #  mysql-connector-odbc requires these
+    mysql_default_charset_info
+    mysql_get_charset
+    mysql_get_charset_by_csname
+    mysql_net_realloc
 
-  IF(VERSION_SCRIPT_TEMPLATE)
-    # Generate version script.  
-    # Create semicolon separated lists of functions to export from 
-    # Since RPM packages use separate versioning for 5.1 API
-    # and 5.5 API (libmysqlclient_16 vs libmysqlclient_18), 
-    # we need 2 lists.
-    SET (CLIENT_API_5_1_LIST)
-    FOREACH (f ${CLIENT_API_FUNCTIONS_5_1})
-      SET(CLIENT_API_5_1_LIST "${CLIENT_API_5_1_LIST}\n${f};")
-    ENDFOREACH()
-	
-    SET (CLIENT_API_5_5_LIST)
-    FOREACH (f ${CLIENT_API_FUNCTIONS_5_5})
-      SET(CLIENT_API_5_5_LIST "${CLIENT_API_5_5_LIST}\n${f};")
-    ENDFOREACH()
+    # PHP's mysqli.so requires this (via the ER() macro)
+    mysql_client_errors
+
+    # Also export the non-renamed variants
+    # (in case someone wants to rebuild mysqli-php or something similar)
+    # See MDEV-4127
+    default_charset_info
+    get_charset
+    get_charset_by_csname
+    net_realloc
+    client_errors
+
+    # pure-ftpd requires this
+    my_make_scrambled_password
+
+    # hydra requires this
+    scramble
+
+    # ODB requires this: https://bugzilla.redhat.com/show_bug.cgi?id=846602
+    THR_KEY_mysys
+
+    # DBD::mysql requires this
+    is_prefix
+  )
+
+ 
+  # And even more so on Debian
+  SET(CLIENT_API_5_5_EXTRA
+    # libmyodbc. Argh!
+    alloc_dynamic
+    alloc_root
+    delete_dynamic
+    dynstr_append
+    dynstr_append_mem
+    dynstr_append_os_quoted
+    dynstr_free
+    dynstr_realloc
+    free_root
+    get_dynamic
+    init_dynamic_array2
+    init_dynamic_string
+    int2str
+    list_add
+    list_delete
+    my_end
+    my_free
+    my_malloc
+    my_memdup
+    my_realloc
+    my_strdup
+    set_dynamic
+    strdup_root
+    strend
+    strfill
+    strmake
+    strmake_root
+    strxmov
+
+    # pam_mysql.so
+    make_scrambled_password
+    make_scrambled_password_323
+  )
+
+  # Linker script to version symbols in Fedora- and Debian- compatible way, MDEV-5529
+  SET(VERSION_SCRIPT_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/libmysql_versions.ld.in)
+
+  # Generate version script.  
+  # Create semicolon separated lists of functions to export from 
+  # Since RPM packages use separate versioning for 5.1 API
+  # and 5.5 API (libmysqlclient_16 vs libmysqlclient_18), 
+  # we need 2 lists.
+  SET (CLIENT_API_5_1_LIST)
+  SET (CLIENT_API_5_1_ALIASES)
+  FOREACH (f ${CLIENT_API_FUNCTIONS_5_1} ${CLIENT_API_5_1_EXTRA})
+    SET(CLIENT_API_5_1_LIST "${CLIENT_API_5_1_LIST}\t${f};\n")
+    SET(CLIENT_API_5_1_ALIASES "${CLIENT_API_5_1_ALIASES}\"${f}@libmysqlclient_16\" = ${f};\n")
+  ENDFOREACH()
+      
+  SET (CLIENT_API_5_5_LIST)
+  FOREACH (f ${CLIENT_API_FUNCTIONS_5_5} ${CLIENT_API_5_5_EXTRA})
+    SET(CLIENT_API_5_5_LIST "${CLIENT_API_5_5_LIST}\t${f};\n")
+  ENDFOREACH()
+
+  CONFIGURE_FILE(
+    ${VERSION_SCRIPT_TEMPLATE}
+    ${CMAKE_CURRENT_BINARY_DIR}/libmysql_versions.ld
+    @ONLY@
+  )
+  SET(VERSION_SCRIPT_LINK_FLAGS 
+    "-Wl,${CMAKE_CURRENT_BINARY_DIR}/libmysql_versions.ld")
 
-    CONFIGURE_FILE(
-      ${VERSION_SCRIPT_TEMPLATE}
-      ${CMAKE_CURRENT_BINARY_DIR}/libmysql.version
-      @ONLY@
-    )
-    SET(VERSION_SCRIPT_LINK_FLAGS 
-      "-Wl,--version-script=${CMAKE_CURRENT_BINARY_DIR}/libmysql.version")
-  ENDIF()
-  
 ENDIF()
 
 
@@ -375,7 +423,9 @@ IF(UNIX)
 ENDIF()
 
 IF(NOT DISABLE_SHARED)
-  MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_EXTRA} COMPONENT SharedLibraries)
+  MERGE_LIBRARIES(libmysql SHARED ${LIBS}
+    EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_5_1_EXTRA} ${CLIENT_API_5_5_EXTRA}
+    COMPONENT SharedLibraries)
   IF(UNIX)
     # libtool compatability
     IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
@@ -392,9 +442,6 @@ IF(NOT DISABLE_SHARED)
       SOVERSION "${SHARED_LIB_MAJOR_VERSION}")
     IF(LINK_FLAG_NO_UNDEFINED OR VERSION_SCRIPT_LINK_FLAGS)
       GET_TARGET_PROPERTY(libmysql_link_flags libmysql LINK_FLAGS)
-      IF(NOT libmysql_link_flag)
-        SET(libmysql_link_flags)
-      ENDIF()
       SET_TARGET_PROPERTIES(libmysql PROPERTIES LINK_FLAGS 
         "${libmysql_link_flags} ${LINK_FLAG_NO_UNDEFINED} ${VERSION_SCRIPT_LINK_FLAGS}")
     ENDIF() 

libmysql/conf_to_src.c

@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2004 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

libmysql/libmysql.c

@@ -1,5 +1,5 @@
-/* Copyright (c) 2000, 2012, Oracle and/or its affiliates
-   Copyright (c) 2009, 2012, Monty Program Ab
+/* Copyright (c) 2000, 2013, Oracle and/or its affiliates
+   Copyright (c) 2009, 2013, Monty Program Ab
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -1273,6 +1273,7 @@ static my_bool setup_one_fetch_function(MYSQL_BIND *, MYSQL_FIELD *field);
 #define RESET_LONG_DATA 2
 #define RESET_STORE_RESULT 4
 #define RESET_CLEAR_ERROR 8
+#define RESET_ALL_BUFFERS 16
 
 static my_bool reset_stmt_handle(MYSQL_STMT *stmt, uint flags);
 
@@ -2083,8 +2084,8 @@ static my_bool execute(MYSQL_STMT *stmt, char *packet, ulong length)
   buff[4]= (char) stmt->flags;
   int4store(buff+5, 1);                         /* iteration count */
 
-  res= test(cli_advanced_command(mysql, COM_STMT_EXECUTE, buff, sizeof(buff),
-                                 (uchar*) packet, length, 1, stmt) ||
+  res= MY_TEST(cli_advanced_command(mysql, COM_STMT_EXECUTE, buff, sizeof(buff),
+                                    (uchar*) packet, length, 1, stmt) ||
             (*mysql->methods->read_query_result)(mysql));
   stmt->affected_rows= mysql->affected_rows;
   stmt->server_status= mysql->server_status;
@@ -2571,7 +2572,7 @@ int STDCALL mysql_stmt_execute(MYSQL_STMT *stmt)
     reinit_result_set_metadata(stmt);
     prepare_to_fetch_result(stmt);
   }
-  DBUG_RETURN(test(stmt->last_errno));
+  DBUG_RETURN(MY_TEST(stmt->last_errno));
 }
 
 
@@ -3187,14 +3188,14 @@ static void fetch_string_with_conversion(MYSQL_BIND *param, char *value,
   {
     double data= my_strntod(&my_charset_latin1, value, length, &endptr, &err);
     float fdata= (float) data;
-    *param->error= (fdata != data) | test(err);
+    *param->error= (fdata != data) | MY_TEST(err);
     floatstore(buffer, fdata);
     break;
   }
   case MYSQL_TYPE_DOUBLE:
   {
     double data= my_strntod(&my_charset_latin1, value, length, &endptr, &err);
-    *param->error= test(err);
+    *param->error= MY_TEST(err);
     doublestore(buffer, data);
     break;
   }
@@ -3204,7 +3205,7 @@ static void fetch_string_with_conversion(MYSQL_BIND *param, char *value,
     MYSQL_TIME_STATUS status;
     str_to_time(value, length, tm, 0, &status);
     err= status.warnings;
-    *param->error= test(err);
+    *param->error= MY_TEST(err);
     break;
   }
   case MYSQL_TYPE_DATE:
@@ -3215,8 +3216,8 @@ static void fetch_string_with_conversion(MYSQL_BIND *param, char *value,
     MYSQL_TIME_STATUS status;
     (void) str_to_datetime(value, length, tm, 0, &status);
     err= status.warnings;
-    *param->error= test(err) && (param->buffer_type == MYSQL_TYPE_DATE &&
-                                 tm->time_type != MYSQL_TIMESTAMP_DATE);
+    *param->error= MY_TEST(err) && (param->buffer_type == MYSQL_TYPE_DATE &&
+                                    tm->time_type != MYSQL_TIMESTAMP_DATE);
     break;
   }
   case MYSQL_TYPE_TINY_BLOB:
@@ -3338,7 +3339,7 @@ static void fetch_long_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field,
   {
     int error;
     value= number_to_datetime(value, 0, (MYSQL_TIME *) buffer, 0, &error);
-    *param->error= test(error);
+    *param->error= MY_TEST(error);
     break;
   }
   default:
@@ -3686,7 +3687,7 @@ static void fetch_result_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field,
 static void fetch_result_tinyint(MYSQL_BIND *param, MYSQL_FIELD *field,
                                  uchar **row)
 {
-  my_bool field_is_unsigned= test(field->flags & UNSIGNED_FLAG);
+  my_bool field_is_unsigned= MY_TEST(field->flags & UNSIGNED_FLAG);
   uchar data= **row;
   *(uchar *)param->buffer= data;
   *param->error= param->is_unsigned != field_is_unsigned && data > INT_MAX8;
@@ -3696,7 +3697,7 @@ static void fetch_result_tinyint(MYSQL_BIND *param, MYSQL_FIELD *field,
 static void fetch_result_short(MYSQL_BIND *param, MYSQL_FIELD *field,
                                uchar **row)
 {
-  my_bool field_is_unsigned= test(field->flags & UNSIGNED_FLAG);
+  my_bool field_is_unsigned= MY_TEST(field->flags & UNSIGNED_FLAG);
   ushort data= (ushort) sint2korr(*row);
   shortstore(param->buffer, data);
   *param->error= param->is_unsigned != field_is_unsigned && data > INT_MAX16;
@@ -3707,7 +3708,7 @@ static void fetch_result_int32(MYSQL_BIND *param,
                                MYSQL_FIELD *field __attribute__((unused)),
                                uchar **row)
 {
-  my_bool field_is_unsigned= test(field->flags & UNSIGNED_FLAG);
+  my_bool field_is_unsigned= MY_TEST(field->flags & UNSIGNED_FLAG);
   uint32 data= (uint32) sint4korr(*row);
   longstore(param->buffer, data);
   *param->error= param->is_unsigned != field_is_unsigned && data > INT_MAX32;
@@ -3718,7 +3719,7 @@ static void fetch_result_int64(MYSQL_BIND *param,
                                MYSQL_FIELD *field __attribute__((unused)),
                                uchar **row)
 {
-  my_bool field_is_unsigned= test(field->flags & UNSIGNED_FLAG);
+  my_bool field_is_unsigned= MY_TEST(field->flags & UNSIGNED_FLAG);
   ulonglong data= (ulonglong) sint8korr(*row);
   *param->error= param->is_unsigned != field_is_unsigned && data > LONGLONG_MAX;
   longlongstore(param->buffer, data);
@@ -4615,6 +4616,14 @@ static my_bool reset_stmt_handle(MYSQL_STMT *stmt, uint flags)
             *mysql->unbuffered_fetch_owner= TRUE;
           mysql->status= MYSQL_STATUS_READY;
         }
+        if (flags & RESET_ALL_BUFFERS)
+        {
+          /* mysql_stmt_next_result will flush all pending
+             result sets 
+          */
+          while (mysql_more_results(mysql) &&
+                 mysql_stmt_next_result(stmt) == 0);
+        }
       }
       if (flags & RESET_SERVER_SIDE)
       {
@@ -4679,27 +4688,18 @@ my_bool STDCALL mysql_stmt_close(MYSQL_STMT *stmt)
   {
     mysql->stmts= list_delete(mysql->stmts, &stmt->list);
     /*
-      Clear NET error state: if the following commands come through
-      successfully, connection will still be usable for other commands.
+     Clear NET error state: if the following commands come through
+     successfully, connection will still be usable for other commands.
     */
     net_clear_error(&mysql->net);
+
     if ((int) stmt->state > (int) MYSQL_STMT_INIT_DONE)
     {
       uchar buff[MYSQL_STMT_HEADER];             /* 4 bytes - stmt id */
 
-      if (mysql->unbuffered_fetch_owner == &stmt->unbuffered_fetch_cancelled)
-        mysql->unbuffered_fetch_owner= 0;
-      if (mysql->status != MYSQL_STATUS_READY)
-      {
-        /*
-          Flush result set of the connection. If it does not belong
-          to this statement, set a warning.
-        */
-        (*mysql->methods->flush_use_result)(mysql, TRUE);
-        if (mysql->unbuffered_fetch_owner)
-          *mysql->unbuffered_fetch_owner= TRUE;
-        mysql->status= MYSQL_STATUS_READY;
-      }
+      if ((rc= reset_stmt_handle(stmt, RESET_ALL_BUFFERS | RESET_CLEAR_ERROR)))
+        return rc;
+
       int4store(buff, stmt->stmt_id);
       if ((rc= stmt_command(mysql, COM_STMT_CLOSE, buff, 4, stmt)))
       {
@@ -4711,7 +4711,7 @@ my_bool STDCALL mysql_stmt_close(MYSQL_STMT *stmt)
   my_free(stmt->extension);
   my_free(stmt);
 
-  DBUG_RETURN(test(rc));
+  DBUG_RETURN(MY_TEST(rc));
 }
 
 /*
@@ -4731,7 +4731,7 @@ my_bool STDCALL mysql_stmt_reset(MYSQL_STMT *stmt)
   /* Reset the client and server sides of the prepared statement */
   DBUG_RETURN(reset_stmt_handle(stmt,
                                 RESET_SERVER_SIDE | RESET_LONG_DATA |
-                                RESET_CLEAR_ERROR));
+                                RESET_ALL_BUFFERS | RESET_CLEAR_ERROR));
 }
 
 /*
@@ -4843,7 +4843,6 @@ int STDCALL mysql_next_result(MYSQL *mysql)
   DBUG_RETURN(-1);				/* No more results */
 }
 
-
 int STDCALL mysql_stmt_next_result(MYSQL_STMT *stmt)
 {
   MYSQL *mysql= stmt->mysql;

libmysql/libmysql.ver.in

@@ -1 +0,0 @@
-libmysqlclient_@SHARED_LIB_MAJOR_VERSION@ { global: *; };

libmysql/libmysql_rpm_version.in

@@ -1,62 +0,0 @@
-# This version script is heavily inspired  by Fedora's and Mageia's version scripts for
-# MySQL client shared library. It is used in MariaDB for building RPMs.
-
-libmysqlclient_16 {
-  global:
-@CLIENT_API_5_1_LIST@
-
-# some stuff from Mageia, I have no idea why it is there
-# But too afraid to throw anything away
-	_fini;
-	_init;
-	my_init;
-	my_progname;
-	myodbc_remove_escape;
-
-# These are documented in Paul DuBois' MySQL book, so we treat them as part
-# of the de-facto API.
-	free_defaults;
-	handle_options;
-	load_defaults;
-	my_print_help;
-# pure-ftpd requires this
-	my_make_scrambled_password;
-# fedora18 export
-	THR_KEY_mysys;
-# hydra requires this
-	scramble;
-# DBD::mysql requires this
-	is_prefix;
-  local:
-	*;
-};
-
-libmysqlclient_18 {
-  global:
-	@CLIENT_API_5_5_LIST@
-#
-# Ideally the following symbols wouldn't be exported, but various applications
-# require them.  Fedora limits the namespace damage by prefixing mysql_
-# (see mysql-dubious-exports.patch), which means the symbols are not present
-# in libmysqlclient_16.
-#
-# MariaDB does not do the Fedora-style function renaming via #define in headers, 
-# however it exports mysql_ prefixed symbols in addition to the "normal" ones.
-#
-# To ensure successful recompilation of affected projects, as well as drop-in replacement
-# for MySQL libraries, provided by distribution, both original symbols and their mysql_ 
-# prefixed counterparts have to be exported.
-
-# mysql-connector-odbc requires these
-	mysql_default_charset_info;
-	mysql_get_charset;
-	mysql_get_charset_by_csname;
-	mysql_net_realloc;
-	default_charset_info;
-	get_charset;
-	get_charset_by_csname;
-	net_realloc;
-# PHP's mysqli.so requires this (via the ER() macro)
-	mysql_client_errors;
-	client_errors;
-};

libmysql/libmysql_versions.ld.in

@@ -0,0 +1,45 @@
+/*
+  This version script is heavily inspired  by Fedora's and Mageia's version
+  scripts for MySQL client shared library.
+  But it was modified to support Debian-compatible versioning too.
+
+  In RedHat universe, symbols from old libmysqlclient.so.16
+  keep their libmysqlclient_16 version. New symbols added in
+  libmysqlclient.so.18 get the new libmysqlclient_18 version.
+
+  In Debian all symbols in libmysqlclient.so.18 have libmysqlclient_18 version,
+  including symbols that existed in libmysqlclient.so.16
+
+  We solve this by putting all symbols into libmysqlclient_18 version node,
+  but creating aliases for old symbols in the libmysqlclient_16 version node.
+*/
+
+@CLIENT_API_5_1_ALIASES@
+
+/*
+  On Fedora the following symbols are exported, but renamed into a mysql_
+  namespace. We export them as aliases, but keep original symbols too. See
+  MDEV-4127.
+*/
+mysql_default_charset_info = default_charset_info;
+mysql_get_charset = get_charset;
+mysql_get_charset_by_csname = get_charset_by_csname;
+mysql_net_realloc = net_realloc;
+mysql_client_errors = client_errors;
+
+VERSION {
+
+libmysqlclient_18 {
+  global:
+@CLIENT_API_5_1_LIST@
+@CLIENT_API_5_5_LIST@
+
+  local:
+	*;
+};
+
+libmysqlclient_16 {
+  /* empty here. aliases are added above */
+};
+
+}

libmysql/rpm_support.cc

@@ -1,41 +0,0 @@
-/*
-  Provide aliases for several symbols, to support drop-in replacement for
-  MariaDB on Fedora and several derives distributions.
-
-  These distributions redefine several symbols (in a way that is no compatible
-  with either MySQL or MariaDB) and export it from the client library ( as seen
-  e.g from this patch)
-http://lists.fedoraproject.org/pipermail/scm-commits/2010-December/537257.html
-
-  MariaDB handles compatibility distribution by providing the same symbols from 
-  the client library if it is built with -DRPM
-
-*/
-#include <errmsg.h>
-#include <my_sys.h>
-#include <mysql.h>
-extern "C" {
-
-CHARSET_INFO *mysql_default_charset_info = default_charset_info;
-
-CHARSET_INFO *mysql_get_charset(uint cs_number, myf flags)
-{
-  return get_charset(cs_number, flags);
-}
-
-CHARSET_INFO *mysql_get_charset_by_csname(const char *cs_name,
-                                           uint cs_flags, myf my_flags)
-{
-   return get_charset_by_csname(cs_name, cs_flags, my_flags);
-}
-
-
-my_bool mysql_net_realloc(NET *net, size_t length)
-{
-   return net_realloc(net,length);
-}
-
-const char **mysql_client_errors = client_errors;
-
-} /*extern "C" */
-

libmysqld/CMakeLists.txt

@@ -22,8 +22,7 @@ ${CMAKE_SOURCE_DIR}/libmysql
 ${CMAKE_SOURCE_DIR}/libmysqld
 ${CMAKE_SOURCE_DIR}/sql
 ${CMAKE_BINARY_DIR}/sql 
-${CMAKE_BINARY_DIR}/pcre
-${CMAKE_SOURCE_DIR}/pcre
+${PCRE_INCLUDES}
 ${ZLIB_INCLUDE_DIR}
 ${SSL_INCLUDE_DIRS}
 ${SSL_INTERNAL_INCLUDE_DIRS}

libmysqld/examples/CMakeLists.txt

@@ -15,8 +15,7 @@
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
                     ${CMAKE_SOURCE_DIR}/libmysqld/include
-                    ${CMAKE_BINARY_DIR}/pcre
-                    ${CMAKE_SOURCE_DIR}/pcre
+                    ${PCRE_INCLUDES}
                     ${CMAKE_SOURCE_DIR}/sql
                     ${MY_READLINE_INCLUDE_DIR}
                     )

libmysqld/lib_sql.cc

@@ -332,8 +332,8 @@ static int emb_stmt_execute(MYSQL_STMT *stmt)
   thd->client_param_count= stmt->param_count;
   thd->client_params= stmt->params;
 
-  res= test(emb_advanced_command(stmt->mysql, COM_STMT_EXECUTE, 0, 0,
-                                 header, sizeof(header), 1, stmt) ||
+  res= MY_TEST(emb_advanced_command(stmt->mysql, COM_STMT_EXECUTE, 0, 0,
+                                    header, sizeof(header), 1, stmt) ||
             emb_read_query_result(stmt->mysql));
   stmt->affected_rows= stmt->mysql->affected_rows;
   stmt->insert_id= stmt->mysql->insert_id;
@@ -566,7 +566,7 @@ int init_embedded_server(int argc, char **argv, char **groups)
     opt_mysql_tmpdir=getenv("TMP");
 #endif
   if (!opt_mysql_tmpdir || !opt_mysql_tmpdir[0])
-    opt_mysql_tmpdir=(char*) DEFAULT_TMPDIR;		/* purecov: inspected */
+    opt_mysql_tmpdir= const_cast<char*>(DEFAULT_TMPDIR); /* purecov: inspected*/
 
   init_ssl();
   umask(((~my_umask) & 0666));

mysql-test/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

mysql-test/collections/default.weekly

@@ -5,3 +5,6 @@ perl mysql-test-run.pl --timer --force --debug-server --parallel=auto  --comment
 perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-tests-innodb-engine --experimental=collections/default.experimental --vardir=var-stmt-eits-tests-innodb-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb --skip-test-list=collections/disabled-weekly.list
 perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-rpl-binlog-row-tests-innodb-engine --experimental=collections/default.experimental --vardir=var-binlog-row-eits-tests-innodb-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb --do-test=rpl --mysqld=--binlog-format=row --skip-test-list=collections/disabled-weekly.list
 perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-rpl-binlog-mixed-tests-innodb-engine --experimental=collections/default.experimental --vardir=var-binlog-mixed-eits-tests-innodb-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb --do-test=rpl --mysqld=--binlog-format=mixed --skip-test-list=collections/disabled-weekly.list
+
+# Run innodb compression tests
+perl mysql-test-run.pl --force --debug-server --comment=innodb_compression --vardir=var-innodb-zip --big-test --testcase-timeout=60 --parallel=auto --experimental=collections/default.experimental --suite=innodb_zip

mysql-test/extra/rpl_tests/rpl_ddl.test

@@ -608,6 +608,7 @@ use test;
 --echo
 --echo -------- switch to master -------
 connection master;
+DROP TEMPORARY TABLE mysqltest1.t22;
 DROP DATABASE mysqltest1;
 # mysqltest2 was alreday DROPPED some tests before.
 DROP DATABASE mysqltest3;

mysql-test/extra/rpl_tests/rpl_log.test

@@ -18,8 +18,12 @@ start slave;
 --source include/wait_for_slave_to_start.inc
 
 let $VERSION=`select version()`;
-
+# Lets run this test in STRICT MODE (DROP TABLE is not DROP TABLE IF EXISTS)
+connection slave;
+set @save_slave_ddl_exec_mode=@@global.slave_ddl_exec_mode;
+set @@global.slave_ddl_exec_mode=STRICT;
 connection master;
+
 eval create table t1(n int not null auto_increment primary key)ENGINE=$engine_type;
 insert into t1 values (NULL);
 drop table t1;
@@ -141,3 +145,5 @@ drop table t1;
 # End of 4.1 tests
 
 sync_slave_with_master;
+set @@global.slave_ddl_exec_mode=@save_slave_ddl_exec_mode;
+connection master;

mysql-test/extra/rpl_tests/rpl_stop_slave.test

@@ -59,3 +59,6 @@ source include/wait_for_slave_sql_to_stop.inc;
 connection slave;
 START SLAVE SQL_THREAD;
 source include/wait_for_slave_sql_to_start.inc;
+
+connection master;
+sync_slave_with_master;

mysql-test/include/commit.inc

@@ -751,7 +751,7 @@ call p_verify_status_increment(4, 4, 4, 4);
 --echo # Sic: no table is created.
 create table if not exists t2 (a int) select 6 union select 7;
 --echo # Sic: first commits the statement, and then the transaction.
-call p_verify_status_increment(2, 0, 2, 0);
+call p_verify_status_increment(0, 0, 0, 0);
 create table t3 select a from t2;
 call p_verify_status_increment(2, 0, 4, 4);
 alter table t3 add column (b int);

mysql-test/include/ctype_filesort2.inc

@@ -14,3 +14,12 @@ SELECT HEX(a), HEX(CONVERT(a USING utf8mb4)) FROM t1 ORDER BY a;
 ALTER TABLE t1 ADD KEY(a);
 SELECT HEX(a), HEX(CONVERT(a USING utf8mb4)) FROM t1 ORDER BY a;
 DROP TABLE IF EXISTS t1;
+--echo #
+--echo # BUG#16691598 - ORDER BY LOWER(COLUMN) PRODUCES
+--echo #                OUT-OF-ORDER RESULTS
+--echo #
+CREATE TABLE  t1 SELECT ('a a') as n;
+INSERT INTO t1 VALUES('a b');
+SELECT * FROM t1 ORDER BY LOWER(n) ASC;
+SELECT * FROM t1 ORDER BY LOWER(n) DESC;
+DROP TABLE t1;

mysql-test/include/have_innodb.combinations

@@ -24,7 +24,7 @@ innodb-sys-foreign
 innodb-sys-foreign-col
 innodb-metrics
 
-[innodb]
+[xtradb]
 innodb
 innodb-cmpmem
 innodb-trx

mysql-test/include/have_metadata_lock_info.inc

@@ -0,0 +1,4 @@
+if (!`SELECT count(*) FROM information_schema.plugins WHERE
+      (PLUGIN_STATUS = 'ACTIVE') AND PLUGIN_NAME = 'METADATA_LOCK_INFO'`){
+  skip Need archive METADATA_LOCK_INFO plugin;
+}

mysql-test/include/have_metadata_lock_info.opt

@@ -0,0 +1,2 @@
+--loose-metadata-lock-info
+--plugin-load-add=$METADATA_LOCK_INFO_SO

mysql-test/include/have_rbr_triggers.inc

@@ -0,0 +1,5 @@
+if (`select count(*) = 0 from information_schema.session_variables where variable_name = 'slave_run_triggers_for_rbr'`)
+{
+  skip RBR triggers are not available;
+}
+

mysql-test/include/have_unix_socket.inc

@@ -0,0 +1,13 @@
+--source include/not_embedded.inc
+
+if (!$AUTH_SOCKET_SO) {
+  skip No unix_socket plugin;
+}
+
+if (!$USER) {
+  skip USER variable is undefined;
+}
+
+if (`SELECT count(*) <> 0 FROM mysql.user WHERE user = '$USER'`) {
+  skip \$USER=$USER which exists in mysql.user;
+}

mysql-test/include/index_merge_ror_cpk.inc

@@ -79,8 +79,11 @@ select pk1,pk2 from t1 where key1 = 10 and key2=10 and 2*pk1+1 < 2*96+1;
 # Verify that CPK is always used for index intersection scans
 # (this is because it is used as a filter, not for retrieval)
 explain select * from t1 where badkey=1 and key1=10;
+set @tmp_index_merge_ror_cpk=@@optimizer_switch;
+set optimizer_switch='extended_keys=off';
 --replace_column 9 ROWS
 explain select * from t1 where pk1 < 7500 and key1 = 10;
+set optimizer_switch=@tmp_index_merge_ror_cpk;
 
 # Verify that keys with 'tails' of PK members are ok.
 explain select * from t1 where pktail1ok=1 and key1=10;

mysql-test/include/mtr_check.sql

@@ -1,4 +1,5 @@
--- Copyright (c) 2008, 2011, Oracle and/or its affiliates
+-- Copyright (c) 2008, 2013, Oracle and/or its affiliates
+-- Copyright (c) 2009, 2013, SkySQL Ab
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -57,6 +58,16 @@ BEGIN
       WHERE table_schema='mysql' AND table_name != 'ndb_apply_status'
         ORDER BY columns_in_mysql;
 
+  -- Dump all events, there should be none
+  SELECT * FROM INFORMATION_SCHEMA.EVENTS;
+  -- Dump all triggers	 except mtr internals, there should be none
+  SELECT * FROM INFORMATION_SCHEMA.TRIGGERS
+         WHERE TRIGGER_NAME NOT IN ('gs_insert', 'ts_insert');
+  -- Dump all created procedures, there should be none
+  SELECT * FROM INFORMATION_SCHEMA.ROUTINES;
+
+  SHOW STATUS LIKE 'slave_open_temp_tables';
+
   -- Checksum system tables to make sure they have been properly
   -- restored after test
   checksum table
@@ -85,7 +96,5 @@ BEGIN
   select * from information_schema.session_variables
     where variable_name = 'debug_sync';
 
- show status like 'slave_open_temp_tables';
-
 END||
 

mysql-test/include/save_master_gtid.inc

@@ -0,0 +1,28 @@
+# ==== Purpose ====
+#
+# Save the current binlog GTID position on the master, to be used
+# with include/sync_with_master_gtid.inc.
+#
+#
+# ==== Usage ====
+#
+# [--let $rpl_debug= 1]
+# --source include/save_master_gtid.inc
+#
+# Parameters:
+#   $rpl_debug
+#     See include/rpl_init.inc
+
+
+--let $include_filename= save_master_gtid.inc
+--source include/begin_include_file.inc
+
+--let $master_pos= `SELECT @@gtid_binlog_pos`
+
+if ($rpl_debug)
+{
+  --echo save_master_gtid saved master_pos='$master_pos'
+}
+
+--let $include_filename= save_master_gtid.inc
+--source include/end_include_file.inc

mysql-test/include/sync_with_master_gtid.inc

@@ -0,0 +1,48 @@
+# ==== Purpose ====
+#
+# Wait until the slave has reached a certain GTID position.
+# Similar to --sync_with_master, but using GTID instead of old-style
+# binlog file/offset coordinates.
+#
+#
+# ==== Usage ====
+#
+# --let $master_pos= `SELECT @@GLOBAL.gtid_binlog_pos`
+# [--let $slave_timeout= NUMBER]
+# [--let $rpl_debug= 1]
+# --source include/sync_with_master_gtid.inc
+#
+# Syncs slave to the specified GTID position.
+#
+# Must be called on the slave.
+#
+# Parameters:
+#   $master_pos
+#     The GTID position to sync to. Typically obtained from
+#      @@GLOBAL.gtid_binlog_pos on the master.
+#
+#   $slave_timeout
+#      Timeout in seconds. The default is 2 minutes.
+#
+#   $rpl_debug
+#      See include/rpl_init.inc
+
+--let $include_filename= sync_with_master_gtid.inc
+--source include/begin_include_file.inc
+
+let $_slave_timeout= $slave_timeout;
+if (!$_slave_timeout)
+{
+  let $_slave_timeout= 120;
+}
+
+--let $_result= `SELECT master_gtid_wait('$master_pos', $_slave_timeout)`
+if ($_result == -1)
+{
+  --let $_current_gtid_pos= `SELECT @@GLOBAL.gtid_slave_pos`
+  --echo Timeout in master_gtid_wait('$master_pos', $_slave_timeout), current slave GTID position is: $_current_gtid_pos.
+  --die Failed to sync with master
+}
+
+--let $include_filename= sync_with_master_gtid.inc
+--source include/end_include_file.inc

mysql-test/include/type_hrtime.inc

@@ -1,6 +1,8 @@
 
 --source include/have_innodb.inc
 
+SET timestamp=UNIX_TIMESTAMP('2001-02-03 10:20:30');
+
 --disable_warnings
 drop table if exists t1, t2, t3;
 --enable_warnings
@@ -126,3 +128,4 @@ select * from t2;
 drop view v1;
 drop table t1, t2;
 
+SET timestamp=DEFAULT;

mysql-test/lib/My/Config.pm

@@ -47,7 +47,7 @@ sub option {
   my $value= $self->{value};
 
   my $opt= $name;
-  $opt= "$name=$value" if ($value);
+  $opt= "$name=$value" if (defined $value);
   $opt= "--$opt" unless ($opt =~ /^--/);
   return $opt;
 }

mysql-test/lib/My/SafeProcess/safe_process.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2011, Oracle and/or its affiliates
+/* Copyright (c) 2008, 2012, Oracle and/or its affiliates
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

mysql-test/lib/My/SysInfo.pm

@@ -1,6 +1,5 @@
 # -*- cperl -*-
-# Copyright (c) 2013 MySQL AB, 2008 Sun Microsystems, Inc.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

mysql-test/lib/mtr_cases.pm

@@ -337,15 +337,20 @@ sub parse_disabled {
 #
 sub collect_default_suites(@)
 {
-  my @dirs = my_find_dir(dirname($::glob_mysql_test_dir),
-                         [ @plugin_suitedirs ], '*');
-  for my $d (@dirs) {
-    next unless -f "$d/suite.pm";
-    my $sname= basename($d);
+  use File::Find;
+  my @dirs;
+  find(sub {
+      push @dirs, [$File::Find::topdir, $File::Find::name]
+        if -d and -f "$File::Find::name/suite.pm";
+  }, my_find_dir(dirname($::glob_mysql_test_dir), \@plugin_suitedirs));
+
+  for (@dirs) {
+    my ($plugin_root, $dir) = @$_;
+    my $sname= substr $dir, 1 + length $plugin_root;
     # ignore overlays here, otherwise we'd need accurate
     # duplicate detection with overlay support for the default suite list
     next if $sname eq 'main' or -d "$::glob_mysql_test_dir/suite/$sname";
-    my $s = load_suite_object($sname, $d);
+    my $s = load_suite_object($sname, $dir);
     push @_, $sname if $s->is_default();
   }
   return @_;

mysql-test/mysql-test-run.pl

@@ -174,6 +174,7 @@ my @DEFAULT_SUITES= qw(
     heap-
     innodb-
     innodb_fts-
+    innodb_zip-
     maria-
     multi_source-
     optimizer_unfixed_bugs-
@@ -2678,7 +2679,7 @@ sub setup_vardir() {
   # and make them world readable
   copytree("$glob_mysql_test_dir/std_data", "$opt_vardir/std_data", "0022");
 
-  # create a plugin dir and copy plugins into it
+  # create a plugin dir and copy or symlink plugins into it
   if ($source_dist)
   {
     $plugindir="$opt_vardir/plugins";
@@ -2696,6 +2697,13 @@ sub setup_vardir() {
     }
     else
     {
+      my $opt_use_copy= 1;
+      if (symlink "$opt_vardir/run", "$plugindir/symlink_test")
+      {
+        $opt_use_copy= 0;
+        unlink "$plugindir/symlink_test";
+      }
+
       for (<../storage/*/.libs/*.so>,
            <../plugin/*/.libs/*.so>,
            <../plugin/*/*/.libs/*.so>,
@@ -2705,7 +2713,14 @@ sub setup_vardir() {
            <$bindir/sql/*.so>)
       {
         my $pname=basename($_);
-        symlink rel2abs($_), "$plugindir/$pname";
+        if ($opt_use_copy)
+        {
+          copy rel2abs($_), "$plugindir/$pname";
+        }
+        else
+        {
+          symlink rel2abs($_), "$plugindir/$pname";
+        }
         set_plugin_var($pname);
       }
     }
@@ -5219,7 +5234,7 @@ sub report_failure_and_restart ($) {
     # In these cases we may want valgrind report from normal termination
     $tinfo->{'dont_kill_server'}= 1;
   }
-  # Shotdown properly if not to be killed (for valgrind)
+  # Shutdown properly if not to be killed (for valgrind)
   stop_all_servers($tinfo->{'dont_kill_server'} ? $opt_shutdown_timeout : 0);
 
   $tinfo->{'result'}= 'MTR_RES_FAILED';
@@ -6188,6 +6203,13 @@ sub valgrind_arguments {
     mtr_add_arg($args, "--num-callers=16");
     mtr_add_arg($args, "--suppressions=%s/valgrind.supp", $glob_mysql_test_dir)
       if -f "$glob_mysql_test_dir/valgrind.supp";
+
+    # Ensure the jemalloc works with mysqld
+    if ($mysqld_variables{'version-malloc-library'} ne "system" &&
+        $$exe =~ /mysqld/)
+    {
+      mtr_add_arg($args, "--soname-synonyms=somalloc=NONE" );
+    }
   }
 
   # Add valgrind options, can be overriden by user
@@ -6318,7 +6340,20 @@ sub usage ($) {
 
 $0 [ OPTIONS ] [ TESTCASE ]
 
-Options to control what engine/variation to run
+Where test case can be specified as:
+
+testcase[.test]         Runs the test case named 'testcase' from all suits
+path-to-testcase
+[suite.]testcase[,combination]
+
+Examples:
+
+alias
+main.alias              'main' is the name of the suite for the 't' directory.
+rpl.rpl_invoked_features,mix,xtradb_plugin
+suite/rpl/t/rpl.rpl_invoked_features
+
+Options to control what engine/variation to run:
 
   embedded-server       Use the embedded server, i.e. no mysqld daemons
   ps-protocol           Use the binary protocol between client and server

mysql-test/r/alter_table.result

@@ -1354,7 +1354,7 @@ CREATE TABLE t1 (
 id INT(11) NOT NULL,
 x_param INT(11) DEFAULT NULL,
 PRIMARY KEY (id)
-);
+) ENGINE=MYISAM;
 ALTER TABLE t1 ADD COLUMN IF NOT EXISTS id INT,
 ADD COLUMN IF NOT EXISTS lol INT AFTER id;
 Warnings:
@@ -1390,6 +1390,77 @@ t1	CREATE TABLE `t1` (
   KEY `x_param1` (`x_param`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
+CREATE TABLE t1 (
+id INT(11) NOT NULL,
+x_param INT(11) DEFAULT NULL,
+PRIMARY KEY (id)
+) ENGINE=INNODB;
+CREATE TABLE t2 (
+id INT(11) NOT NULL) ENGINE=INNODB;
+ALTER TABLE t1 ADD COLUMN IF NOT EXISTS id INT,
+ADD COLUMN IF NOT EXISTS lol INT AFTER id;
+Warnings:
+Note	1060	Duplicate column name 'id'
+ALTER TABLE t1 ADD COLUMN IF NOT EXISTS lol INT AFTER id;
+Warnings:
+Note	1060	Duplicate column name 'lol'
+ALTER TABLE t1 DROP COLUMN IF EXISTS lol;
+ALTER TABLE t1 DROP COLUMN IF EXISTS lol;
+Warnings:
+Note	1091	Can't DROP 'lol'; check that column/key exists
+ALTER TABLE t1 ADD KEY IF NOT EXISTS x_param(x_param);
+ALTER TABLE t1 ADD KEY IF NOT EXISTS x_param(x_param);
+Warnings:
+Note	1061	Duplicate key name 'x_param'
+ALTER TABLE t1 MODIFY IF EXISTS lol INT;
+Warnings:
+Note	1054	Unknown column 'lol' in 't1'
+DROP INDEX IF EXISTS x_param ON t1;
+DROP INDEX IF EXISTS x_param ON t1;
+Warnings:
+Note	1091	Can't DROP 'x_param'; check that column/key exists
+CREATE INDEX IF NOT EXISTS x_param1 ON t1(x_param);
+CREATE INDEX IF NOT EXISTS x_param1 ON t1(x_param);
+Warnings:
+Note	1061	Duplicate key name 'x_param1'
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `id` int(11) NOT NULL,
+  `x_param` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `x_param1` (`x_param`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+ALTER TABLE t2 ADD FOREIGN KEY IF NOT EXISTS fk(id) REFERENCES t1(id);
+ALTER TABLE t2 ADD FOREIGN KEY IF NOT EXISTS fk(id) REFERENCES t1(id);
+Warnings:
+Note	1061	Duplicate key name 'fk'
+ALTER TABLE t2 DROP FOREIGN KEY IF EXISTS fk;
+ALTER TABLE t2 DROP FOREIGN KEY IF EXISTS fk;
+Warnings:
+Note	1091	Can't DROP 'fk'; check that column/key exists
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `id` int(11) NOT NULL,
+  KEY `fk` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+ALTER TABLE t2 ADD FOREIGN KEY (id) REFERENCES t1(id);
+ALTER TABLE t2 ADD FOREIGN KEY IF NOT EXISTS t2_ibfk_1(id) REFERENCES t1(id);
+Warnings:
+Note	1061	Duplicate key name 't2_ibfk_1'
+ALTER TABLE t2 DROP FOREIGN KEY IF EXISTS t2_ibfk_1;
+ALTER TABLE t2 DROP FOREIGN KEY IF EXISTS t2_ibfk_1;
+Warnings:
+Note	1091	Can't DROP 't2_ibfk_1'; check that column/key exists
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `id` int(11) NOT NULL,
+  KEY `id` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+DROP TABLE t2;
+DROP TABLE t1;
 #
 # Bug#11938817 ALTER BEHAVIOR DIFFERENT THEN DOCUMENTED
 #

mysql-test/r/backup.result

@@ -1,111 +0,0 @@
-set SQL_LOG_BIN=0;
-drop table if exists t1, t2, t3, t4;
-create table t4(n int);
-backup table t4 to '../../bogus';
-Table	Op	Msg_type	Msg_text
-test.t4	backup	error	Failed copying .frm file (errno: X)
-test.t4	backup	Warning	'BACKUP TABLE' is deprecated and will be removed in a future release. Please use MySQL Administrator (mysqldump, mysql) instead
-test.t4	backup	Error	Can't create/write to file 'MYSQLTEST_VARDIR/bogus/t4.frm' (Errcode: X)
-test.t4	backup	status	Operation failed
-backup table t4 to '../../tmp';
-Table	Op	Msg_type	Msg_text
-test.t4	backup	Warning	'BACKUP TABLE' is deprecated and will be removed in a future release. Please use MySQL Administrator (mysqldump, mysql) instead
-test.t4	backup	status	OK
-backup table t4 to '../../tmp';
-Table	Op	Msg_type	Msg_text
-test.t4	backup	error	Failed copying .frm file (errno: X)
-test.t4	backup	Warning	'BACKUP TABLE' is deprecated and will be removed in a future release. Please use MySQL Administrator (mysqldump, mysql) instead
-test.t4	backup	Error	Can't create/write to file 'MYSQLTEST_VARDIR/tmp/t4.frm' (Errcode: X)
-test.t4	backup	status	Operation failed
-drop table t4;
-restore table t4 from '../../tmp';
-Table	Op	Msg_type	Msg_text
-test.t4	restore	Warning	'RESTORE TABLE' is deprecated and will be removed in a future release. Please use MySQL Administrator (mysqldump, mysql) instead
-test.t4	restore	status	OK
-select count(*) from t4;
-count(*)
-0
-create table t1(n int);
-insert into t1 values (23),(45),(67);
-backup table t1 to '../../tmp';
-Table	Op	Msg_type	Msg_text
-test.t1	backup	Warning	'BACKUP TABLE' is deprecated and will be removed in a future release. Please use MySQL Administrator (mysqldump, mysql) instead
-test.t1	backup	status	OK
-drop table t1;
-restore table t1 from '../../bogus';
-Table	Op	Msg_type	Msg_text
-t1	restore	error	Failed copying .frm file
-Warnings:
-Warning	1287	'RESTORE TABLE' is deprecated and will be removed in a future release. Please use MySQL Administrator (mysqldump, mysql) instead
-Error	29	File 'MYSQLTEST_VARDIR/bogus/t1.frm' not found (Errcode: X)
-restore table t1 from '../../tmp';
-Table	Op	Msg_type	Msg_text
-test.t1	restore	Warning	'RESTORE TABLE' is deprecated and will be removed in a future release. Please use MySQL Administrator (mysqldump, mysql) instead
-test.t1	restore	status	OK
-select n from t1;
-n
-23
-45
-67
-create table t2(m int not null primary key);
-create table t3(k int not null primary key);
-insert into t2 values (123),(145),(167);
-insert into t3 values (223),(245),(267);
-backup table t2,t3 to '../../tmp';
-Table	Op	Msg_type	Msg_text
-test.t2	backup	Warning	'BACKUP TABLE' is deprecated and will be removed in a future release. Please use MySQL Administrator (mysqldump, mysql) instead
-test.t2	backup	status	OK
-test.t3	backup	status	OK
-drop table t1,t2,t3;
-restore table t1,t2,t3 from '../../tmp';
-Table	Op	Msg_type	Msg_text
-test.t1	restore	Warning	'RESTORE TABLE' is deprecated and will be removed in a future release. Please use MySQL Administrator (mysqldump, mysql) instead
-test.t1	restore	status	OK
-test.t2	restore	status	OK
-test.t3	restore	status	OK
-select n from t1;
-n
-23
-45
-67
-select m from t2;
-m
-123
-145
-167
-select k from t3;
-k
-223
-245
-267
-drop table t1,t2,t3,t4;
-restore table t1 from '../../tmp';
-Table	Op	Msg_type	Msg_text
-test.t1	restore	Warning	'RESTORE TABLE' is deprecated and will be removed in a future release. Please use MySQL Administrator (mysqldump, mysql) instead
-test.t1	restore	status	OK
-rename table t1 to t5;
-lock tables t5 write;
-backup table t5 to '../../tmp';
-unlock tables;
-Table	Op	Msg_type	Msg_text
-test.t5	backup	Warning	'BACKUP TABLE' is deprecated and will be removed in a future release. Please use MySQL Administrator (mysqldump, mysql) instead
-test.t5	backup	status	OK
-drop table t5;
-DROP TABLE IF EXISTS `t+1`;
-CREATE  TABLE `t+1` (c1 INT);
-INSERT  INTO  `t+1` VALUES (1), (2), (3);
-BACKUP  TABLE `t+1` TO '../../tmp';
-Table	Op	Msg_type	Msg_text
-test.t+1	backup	Warning	'BACKUP TABLE' is deprecated and will be removed in a future release. Please use MySQL Administrator (mysqldump, mysql) instead
-test.t+1	backup	status	OK
-DROP    TABLE `t+1`;
-RESTORE TABLE `t+1` FROM '../../tmp';
-Table	Op	Msg_type	Msg_text
-test.t+1	restore	Warning	'RESTORE TABLE' is deprecated and will be removed in a future release. Please use MySQL Administrator (mysqldump, mysql) instead
-test.t+1	restore	status	OK
-SELECT * FROM `t+1`;
-c1
-1
-2
-3
-DROP    TABLE `t+1`;

mysql-test/r/binlog_tx_isolation.result

@@ -1,48 +0,0 @@
-CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=INNODB;
-INSERT INTO t1 VALUES (1,1),(2,2),(3,3),(4,4),(5,5),(6,6);
-SET BINLOG_FORMAT=STATEMENT;
-BEGIN;
-SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
-ERROR HY000: Transaction isolation level 'READ-COMMITTED' is not safe for 'STATEMENT' binlog mode
-UPDATE t1 SET b = a*a WHERE a > 1;
-COMMIT;
-BEGIN;
-SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-UPDATE t1 SET b = a*a WHERE a > 1;
-COMMIT;
-BEGIN;
-SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE;
-UPDATE t1 SET b = a*a WHERE a > 1;
-COMMIT;
-SET BINLOG_FORMAT=MIXED;
-BEGIN;
-SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
-ERROR HY000: Transaction isolation level 'READ-COMMITTED' is not safe for 'MIXED' binlog mode
-UPDATE t1 SET b = a*a*a WHERE a > 2;
-COMMIT;
-SET BINLOG_FORMAT=ROW;
-BEGIN;
-SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
-UPDATE t1 SET b = a*a*a*a WHERE a > 3;
-COMMIT;
-SELECT @@session.tx_isolation, @@session.binlog_format;
-@@session.tx_isolation	READ-COMMITTED
-@@session.binlog_format	ROW
-BEGIN;
-SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
-SET BINLOG_FORMAT=MIXED;
-ERROR HY000: Transaction isolation level 'READ-COMMITTED' prevents leaving 'ROW' binlog mode
-UPDATE t1 SET b = a*a*a*a WHERE a > 3;
-COMMIT;
-SELECT @@session.tx_isolation, @@session.binlog_format;
-@@session.tx_isolation	READ-COMMITTED
-@@session.binlog_format	ROW
-BEGIN;
-SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
-SET BINLOG_FORMAT=STATEMENT;
-ERROR HY000: Transaction isolation level 'READ-COMMITTED' prevents leaving 'ROW' binlog mode
-UPDATE t1 SET b = a*a*a*a WHERE a > 3;
-COMMIT;
-SELECT @@session.tx_isolation, @@session.binlog_format;
-@@session.tx_isolation	READ-COMMITTED
-@@session.binlog_format	ROW

mysql-test/r/blackhole.result

@@ -9,3 +9,11 @@ SELECT 1 FROM t1 WHERE a = ANY (SELECT a FROM t2);
 1
 DROP TABLE t1, t2;
 End of 5.5 tests 
+#
+# Bug#13948247 DIVISION BY 0 IN GET_BEST_DISJUNCT_QUICK WITH FORCE INDEX GROUP BY
+#
+CREATE TABLE t1(a INT, b INT, c INT, KEY(c), UNIQUE(a)) ENGINE = BLACKHOLE;
+SELECT 0 FROM t1 FORCE INDEX FOR GROUP BY(a) WHERE a = 0 OR b = 0 AND c = 0;
+0
+DROP TABLE t1;
+End of 5.6 tests

mysql-test/r/cast.result

@@ -1,3 +1,4 @@
+SET timestamp=unix_timestamp('2001-02-03 10:20:30');
 select CAST(1-2 AS UNSIGNED);
 CAST(1-2 AS UNSIGNED)
 18446744073709551615
@@ -62,7 +63,7 @@ cast(12.444 as double)
 12.444
 select cast(cast("20:01:01" as time) as datetime);
 cast(cast("20:01:01" as time) as datetime)
-0000-00-00 20:01:01
+2001-02-03 20:01:01
 select cast(cast("8:46:06.23434" AS time) as decimal(32,10));
 cast(cast("8:46:06.23434" AS time) as decimal(32,10))
 84606.0000000000
@@ -764,7 +765,7 @@ cast(cast("2101-00-01 02:03:04" as datetime) as time)
 02:03:04
 SELECT CAST(CAST('20:05:05' AS TIME) as date);
 CAST(CAST('20:05:05' AS TIME) as date)
-0000-00-00
+2001-02-03
 set sql_mode= TRADITIONAL;
 select cast("2101-00-01 02:03:04" as datetime);
 cast("2101-00-01 02:03:04" as datetime)
@@ -778,9 +779,7 @@ Warnings:
 Warning	1292	Incorrect datetime value: '2101-00-01 02:03:04'
 SELECT CAST(CAST('20:05:05' AS TIME) as date);
 CAST(CAST('20:05:05' AS TIME) as date)
-NULL
-Warnings:
-Warning	1292	Incorrect datetime value: '20:05:05'
+2001-02-03
 set sql_mode=DEFAULT;
 create table t1 (f1 time, f2 date, f3 datetime);
 insert into t1 values ('11:22:33','2011-12-13','2011-12-13 11:22:33');
@@ -790,9 +789,7 @@ cast(f1 as unsigned)	cast(f2 as unsigned)	cast(f3 as unsigned)
 drop table t1;
 SELECT CAST(TIME('10:20:30') AS DATE) + INTERVAL 1 DAY;
 CAST(TIME('10:20:30') AS DATE) + INTERVAL 1 DAY
-NULL
-Warnings:
-Warning	1292	Incorrect datetime value: '0000-00-00'
+2001-02-04
 SET SQL_MODE=ALLOW_INVALID_DATES;
 SELECT DATE("foo");
 DATE("foo")

mysql-test/r/comment_column.result

@@ -408,4 +408,7 @@ Warning	1688	Comment for index 'i1' is too long (max = 1024)
 CREATE INDEX i2 ON t1_toupg(c2) COMMENT '01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234';
 Warnings:
 Warning	1688	Comment for index 'i2' is too long (max = 1024)
+ALTER TABLE t1_toupg drop column c1, drop column c2, drop column c3, add column c4 int, COMMENT='012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012301234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234';
+Warnings:
+Warning	1628	Comment for table 't1_toupg' is too long (max = 2048)
 drop table t1_toupg;

mysql-test/r/comments.result

@@ -35,6 +35,12 @@ select 1 /*M!50000 +1 */;
 select 1 /*M!50300 +1 */;
 1  +1
 2
+select 2 /*M!99999 +1 */;
+2  +1
+3
+select 2 /*M!100000 +1 */;
+2  +1
+3
 select 2 /*M!999999 +1 */;
 2
 2