[Pkg-mysql-commits] [mariadb-5.5] 04/05: Merge tag 'upstream/5.5.39'
Otto Kekäläinen
ottok-guest at moszumanska.debian.org
Thu Aug 7 13:21:03 UTC 2014
This is an automated email from the git hooks/post-receive script.
ottok-guest pushed a commit to branch master
in repository mariadb-5.5.
commit aef29c4edfe28431a876595e65c51943786f1b25
Merge: 4eb75ae d1cec82
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date: Thu Aug 7 14:55:57 2014 +0300
Merge tag 'upstream/5.5.39'
Upstream version 5.5.39
CMakeLists.txt | 9 +-
Docs/INFO_SRC | 10 +-
VERSION | 2 +-
client/mysqladmin.cc | 63 +-
client/mysqldump.c | 41 +-
cmake/dtrace.cmake | 43 +-
cmake/install_macros.cmake | 4 +-
cmake/os/Windows.cmake | 29 +-
extra/yassl/CMakeLists.txt | 3 +-
extra/yassl/src/ssl.cpp | 7 +-
extra/yassl/taocrypt/CMakeLists.txt | 3 +-
extra/yassl/taocrypt/include/asn.hpp | 8 +-
include/thread_pool_priv.h | 4 +-
libmysql/CMakeLists.txt | 1 -
man/CMakeLists.txt | 1 +
man/aria_pack.1 | 2 +-
man/mysqlbinlog.1 | 7 +-
man/mysqldump.1 | 2 +-
mysql-test/collections/default.weekly | 0
mysql-test/include/install_semisync.inc | 4 +-
mysql-test/include/mtr_warnings.sql | 1 +
mysql-test/include/stop_dump_threads.inc | 32 +
mysql-test/include/uninstall_semisync.inc | 5 +
mysql-test/r/ctype_ucs.result | 33 +
mysql-test/r/ctype_utf32.result | 33 +
mysql-test/r/func_str.result | 3 +
mysql-test/r/func_time.result | 147 +-
mysql-test/r/group_min_max.result | 56 +-
mysql-test/r/group_min_max_innodb.result | 168 +
mysql-test/r/innodb_load_xa.result | 20 +
mysql-test/r/mysqld--help.result | 4 +-
mysql-test/r/order_by_innodb.result | 13 +
mysql-test/r/partition.result | 44 +
mysql-test/r/partition_innodb.result | 28 +
mysql-test/r/partition_pruning.result | 114 +
mysql-test/r/plugin_loaderr.result | 3 +
mysql-test/r/subselect_mat.result | 37 +
mysql-test/r/subselect_sj_mat.result | 37 +
mysql-test/r/type_decimal.result | 4 +-
mysql-test/r/type_newdecimal.result | 6 +-
mysql-test/r/union.result | 34 +
mysql-test/r/variables.result | 4 +
mysql-test/r/view.result | 94 +
mysql-test/std_data/checkDBI_DBD-mysql.pl | 0
mysql-test/suite/archive/partition_archive.result | 26 +
mysql-test/suite/archive/partition_archive.test | 18 +
mysql-test/suite/binlog/t/binlog_killed.test | 4 +
mysql-test/suite/engines/iuds/r/insert_time.result | 4 +-
mysql-test/suite/engines/iuds/suite.opt | 2 +
.../include/innodb_simulate_comp_failures.inc | 147 +
mysql-test/suite/innodb/r/blob_unique2pk.result | 15 +
mysql-test/suite/innodb/r/innodb-fk.result | 35 +
.../innodb/r/innodb_simulate_comp_failures.result | 8 +
.../r/innodb_simulate_comp_failures_small.result | 8 +
mysql-test/suite/innodb/t/blob_unique2pk.test | 20 +
mysql-test/suite/innodb/t/innodb-fk.test | 86 +
.../suite/innodb/t/innodb_bug60196-master.opt | 2 +-
.../t/innodb_simulate_comp_failures-master.opt | 2 +
.../innodb/t/innodb_simulate_comp_failures.test | 8 +
.../innodb_simulate_comp_failures_small-master.opt | 2 +
.../t/innodb_simulate_comp_failures_small.test | 5 +
mysql-test/suite/maria/maria_partition.result | 15 +
mysql-test/suite/maria/maria_partition.test | 22 +
.../suite/rpl/r/failed_create_view-6409.result | 15 +
mysql-test/suite/rpl/r/kill_hard-6290.result | 4 +
mysql-test/suite/rpl/r/rpl_heartbeat_debug.result | 25 +
mysql-test/suite/rpl/r/rpl_semi_sync.result | 4 +-
.../rpl/r/rpl_semi_sync_uninstall_plugin.result | 61 +
mysql-test/suite/rpl/r/rpl_stop_slave.result | 7 +-
.../suite/rpl/t/failed_create_view-6409.test | 24 +
mysql-test/suite/rpl/t/kill_hard-6290.test | 11 +
mysql-test/suite/rpl/t/rpl_heartbeat_debug.test | 52 +
mysql-test/suite/rpl/t/rpl_semi_sync.test | 12 +-
.../rpl/t/rpl_semi_sync_uninstall_plugin.test | 130 +
mysql-test/suite/rpl/t/rpl_stop_slave.test | 27 +-
.../r/innodb_simulate_comp_failures_basic.result | 77 +
.../suite/sys_vars/r/timed_mutexes_basic.result | 20 +
.../t/innodb_simulate_comp_failures_basic.test | 64 +
mysql-test/t/ctype_ucs.test | 17 +
mysql-test/t/ctype_utf32.test | 16 +
mysql-test/t/func_str.test | 5 +
mysql-test/t/func_time.test | 93 +-
mysql-test/t/group_min_max.test | 25 +
mysql-test/t/group_min_max_innodb.test | 93 +
mysql-test/t/innodb_load_xa.opt | 1 +
mysql-test/t/innodb_load_xa.test | 18 +
mysql-test/t/long_tmpdir-master.sh | 0
mysql-test/t/lowercase_mixed_tmpdir-master.sh | 0
mysql-test/t/lowercase_table4-master.opt | 2 +-
mysql-test/t/order_by_innodb.test | 23 +
mysql-test/t/partition.test | 42 +
mysql-test/t/partition_innodb.test | 27 +
mysql-test/t/partition_pruning.test | 48 +
mysql-test/t/plugin_loaderr.test | 16 +
mysql-test/t/subselect_sj_mat.test | 33 +
mysql-test/t/union.test | 30 +
mysql-test/t/view.test | 104 +
mysys/CMakeLists.txt | 3 +-
mysys/mf_iocache2.c | 9 +-
packaging/rpm-oel/filter-requires.sh | 2 +-
packaging/rpm-oel/mysql.spec.in | 51 +-
packaging/rpm-uln/CMakeLists.txt | 38 -
packaging/rpm-uln/README-ULN | 15 -
packaging/rpm-uln/README.mysql-docs | 4 -
packaging/rpm-uln/filter-requires-mysql.sh | 3 -
packaging/rpm-uln/generate-tarball.sh | 15 -
packaging/rpm-uln/my.cnf | 10 -
packaging/rpm-uln/my_config.h | 29 -
packaging/rpm-uln/mysql-5.5-errno.patch | 21 -
packaging/rpm-uln/mysql-5.5-fix-tests.patch | 34 -
packaging/rpm-uln/mysql-5.5-libdir.patch | 28 -
packaging/rpm-uln/mysql-5.5-mtr1.patch | 25 -
packaging/rpm-uln/mysql-5.5-stack-guard.patch | 140 -
packaging/rpm-uln/mysql-5.5-testing.patch | 23 -
packaging/rpm-uln/mysql-chain-certs.patch | 45 -
packaging/rpm-uln/mysql-embedded-check.c | 26 -
packaging/rpm-uln/mysql-expired-certs.patch | 555 ---
packaging/rpm-uln/mysql-install-test.patch | 33 -
packaging/rpm-uln/mysql-strmov.patch | 32 -
packaging/rpm-uln/mysql.init | 209 --
packaging/rpm-uln/mysql.spec.sh | 1991 ----------
packaging/rpm-uln/scriptstub.c | 32 -
plugin/win_auth_client/CMakeLists.txt | 1 -
scripts/CMakeLists.txt | 1 +
scripts/mysql_config.sh | 7 +-
scripts/mysqlaccess.conf | 0
scripts/mysqld_safe.sh | 29 +-
sql-bench/graph-compare-results.sh | 0
sql-bench/innotest1.sh | 280 +-
sql-bench/innotest1a.sh | 212 +-
sql-bench/innotest1b.sh | 198 +-
sql-bench/innotest2.sh | 296 +-
sql-bench/innotest2a.sh | 184 +-
sql-bench/innotest2b.sh | 204 +-
sql/CMakeLists.txt | 10 +-
sql/field.h | 23 +
sql/filesort.cc | 3 +
sql/handler.cc | 12 +
sql/item.cc | 2 +-
sql/item.h | 38 +
sql/item_func.cc | 93 +-
sql/item_func.h | 17 +-
sql/item_strfunc.cc | 104 +-
sql/item_strfunc.h | 15 +
sql/item_subselect.cc | 5 +-
sql/item_timefunc.h | 10 +-
sql/log.cc | 9 +-
sql/log.h | 9 +-
sql/log_event.cc | 6 +-
sql/mysqld.cc | 7 +-
sql/opt_range.cc | 279 +-
sql/opt_range.h | 15 +
sql/replication.h | 14 +
sql/rpl_handler.cc | 79 +-
sql/rpl_handler.h | 5 +-
sql/scheduler.cc | 4 +-
sql/scheduler.h | 5 +-
sql/slave.cc | 39 +-
sql/sql_cache.cc | 4 +-
sql/sql_class.cc | 2 +-
sql/sql_delete.cc | 3 +-
sql/sql_derived.cc | 6 +-
sql/sql_insert.cc | 2 +-
sql/sql_lex.cc | 21 +-
sql/sql_lex.h | 6 +-
sql/sql_parse.cc | 4 +-
sql/sql_partition.cc | 65 +-
sql/sql_plugin.cc | 2 +-
sql/sql_repl.cc | 2 +-
sql/sql_select.cc | 61 +-
sql/sql_select.h | 4 +-
sql/sql_show.cc | 5 +-
sql/sql_table.cc | 64 +-
sql/sql_table.h | 3 +
sql/sql_union.cc | 8 +-
sql/sql_view.cc | 10 +-
sql/sql_yacc.cc | 3819 ++++++++++----------
sql/sql_yacc.yy | 5 +-
sql/sys_vars.cc | 9 +-
sql/table.cc | 27 +-
storage/heap/hp_block.c | 6 +-
storage/heap/hp_create.c | 3 +-
storage/heap/hp_write.c | 2 +-
storage/innobase/btr/btr0cur.c | 5 +-
storage/innobase/buf/buf0lru.c | 18 +
storage/innobase/dict/dict0crea.c | 42 +-
storage/innobase/dict/dict0dict.c | 103 +-
storage/innobase/dict/dict0load.c | 110 +-
storage/innobase/dict/dict0mem.c | 15 +-
storage/innobase/handler/ha_innodb.cc | 14 +
storage/innobase/handler/i_s.cc | 13 +
storage/innobase/include/dict0dict.h | 39 +-
storage/innobase/include/dict0dict.ic | 61 +-
storage/innobase/include/dict0load.h | 12 +
storage/innobase/include/dict0mem.h | 12 +-
storage/innobase/include/srv0srv.h | 4 +
storage/innobase/page/page0zip.c | 26 +
storage/innobase/row/row0sel.c | 35 +-
storage/innobase/srv/srv0srv.c | 4 +
storage/innobase/sync/sync0arr.c | 66 +-
storage/maria/ha_maria.cc | 56 +-
storage/maria/ma_close.c | 4 +-
storage/maria/ma_open.c | 5 +-
storage/maria/ma_state.c | 3 +-
storage/maria/maria_def.h | 2 +
storage/myisam/ha_myisam.cc | 1 -
storage/tokudb/CMakeLists.in | 29 -
storage/tokudb/CMakeLists.txt | 1 +
storage/tokudb/README.md | 8 +-
storage/tokudb/ft-index/CMakeLists.txt | 25 +
.../ft-index/cmake_modules/TokuThirdParty.cmake | 53 +-
storage/tokudb/ft-index/ft/checkpoint.cc | 8 +-
.../tokudb/ft-index/ft/ft-cachetable-wrappers.cc | 22 +
.../tokudb/ft-index/ft/ft-cachetable-wrappers.h | 3 +
storage/tokudb/ft-index/ft/ft-flusher.cc | 25 +-
storage/tokudb/ft-index/ft/ft-internal.h | 25 +-
storage/tokudb/ft-index/ft/ft-ops.cc | 408 ++-
storage/tokudb/ft-index/ft/ft-ops.h | 3 +
storage/tokudb/ft-index/ft/ft-serialize.cc | 1 +
storage/tokudb/ft-index/ft/ft-verify.cc | 26 +-
storage/tokudb/ft-index/ft/ft_layout_version.h | 1 +
storage/tokudb/ft-index/ft/ft_node-serialize.cc | 132 +-
storage/tokudb/ft-index/ft/ftloader-internal.h | 4 +-
storage/tokudb/ft-index/ft/ftloader.cc | 165 +-
storage/tokudb/ft-index/ft/ftloader.h | 3 +-
storage/tokudb/ft-index/ft/log_upgrade.cc | 4 +-
storage/tokudb/ft-index/ft/logger.cc | 2 +-
.../ft/tests/ftloader-test-bad-generate.cc | 2 +-
.../ft/tests/ftloader-test-extractor-errors.cc | 2 +-
.../ft-index/ft/tests/ftloader-test-extractor.cc | 2 +-
.../ft/tests/ftloader-test-merge-files-dbufio.cc | 7 +-
.../tokudb/ft-index/ft/tests/ftloader-test-open.cc | 2 +-
... => test_rightmost_leaf_seqinsert_heuristic.cc} | 173 +-
.../ft/tests/test_rightmost_leaf_split_merge.cc | 212 ++
storage/tokudb/ft-index/ft/tokuftdump.cc | 415 +--
.../tokudb/ft-index/scripts/run.stress-tests.py | 5 +-
storage/tokudb/ft-index/src/loader.cc | 52 +-
...er-create-close.cc => dbremove-nofile-limit.cc} | 73 +-
...create-close.cc => loader-close-nproc-limit.cc} | 40 +-
.../ft-index/src/tests/loader-create-close.cc | 14 +-
...lose.cc => loader-create-commit-nproc-limit.cc} | 51 +-
...reate-close.cc => loader-create-nproc-limit.cc} | 43 +-
.../tests/test_insert_unique.cc} | 164 +-
storage/tokudb/ft-index/src/ydb.cc | 10 +-
storage/tokudb/ft-index/src/ydb_db.cc | 26 +-
storage/tokudb/ft-index/src/ydb_write.cc | 82 +-
storage/tokudb/ft-index/util/omt.cc | 3 +
.../tests/threadpool-nproc-limit.cc} | 129 +-
storage/tokudb/ft-index/util/threadpool.cc | 25 +-
storage/tokudb/ha_tokudb.cc | 229 +-
storage/tokudb/ha_tokudb.h | 12 +-
storage/tokudb/ha_tokudb_admin.cc | 44 +-
storage/tokudb/ha_tokudb_alter_56.cc | 21 +-
storage/tokudb/ha_tokudb_alter_common.cc | 2 +-
storage/tokudb/hatoku_defines.h | 14 +-
storage/tokudb/hatoku_hton.cc | 40 +-
.../tokudb/r/i_s_tokudb_lock_waits_released.result | 2 +
.../tokudb/r/i_s_tokudb_lock_waits_timeout.result | 1 +
.../mysql-test/tokudb/r/i_s_tokudb_locks.result | 2 +-
.../tokudb/r/i_s_tokudb_locks_released.result | 1 +
.../tokudb/mysql-test/tokudb/r/type_decimal.result | 4 +-
.../mysql-test/tokudb/r/type_newdecimal.result | 6 +-
.../tokudb/t/i_s_tokudb_lock_waits_released.test | 2 +
.../tokudb/t/i_s_tokudb_lock_waits_timeout.test | 1 +
.../mysql-test/tokudb/t/i_s_tokudb_locks.test | 2 +-
.../tokudb/t/i_s_tokudb_locks_released.test | 5 +-
.../tokudb_bugs/r/lock_uniq_key_empty.result | 2 +
.../tokudb_bugs/t/lock_uniq_key_empty.test | 2 +
storage/tokudb/scripts/setup.mysql.bash | 83 +-
storage/xtradb/btr/btr0cur.c | 8 +-
storage/xtradb/buf/buf0buf.c | 75 +-
storage/xtradb/buf/buf0flu.c | 3 +-
storage/xtradb/buf/buf0lru.c | 138 +-
storage/xtradb/buf/buf0rea.c | 8 +-
storage/xtradb/dict/dict0load.c | 17 +
storage/xtradb/handler/ha_innodb.cc | 24 +-
storage/xtradb/include/buf0buf.ic | 11 +-
storage/xtradb/include/buf0lru.h | 2 +-
storage/xtradb/include/os0file.h | 4 +-
storage/xtradb/include/srv0srv.h | 4 +
storage/xtradb/include/univ.i | 4 +-
storage/xtradb/os/os0stacktrace.c | 6 +-
storage/xtradb/page/page0zip.c | 26 +
storage/xtradb/row/row0ins.c | 17 +-
storage/xtradb/row/row0sel.c | 35 +-
storage/xtradb/srv/srv0srv.c | 4 +
storage/xtradb/sync/sync0arr.c | 177 +-
strings/CMakeLists.txt | 3 +-
strings/ctype-bin.c | 3 +-
strings/ctype-eucjpms.c | 5 +-
strings/ctype-ucs2.c | 12 +-
strings/ctype-ujis.c | 6 +-
support-files/CMakeLists.txt | 8 +-
.../{mysql.5.5.38.spec => mysql.5.5.39.spec} | 11 +-
support-files/mysql.server.sh | 5 +
support-files/mysql.spec.sh | 7 +-
vio/CMakeLists.txt | 3 +-
zlib/CMakeLists.txt | 3 +-
298 files changed, 8828 insertions(+), 7855 deletions(-)
--
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-mysql/mariadb-5.5.git
More information about the Pkg-mysql-commits
mailing list