[Pkg-mysql-commits] [mariadb-5.5] 02/03: Merge tag 'upstream/5.5.50' into ubuntu-14.04
Otto Kekäläinen
otto at moszumanska.debian.org
Fri Jul 22 11:11:56 UTC 2016
This is an automated email from the git hooks/post-receive script.
otto pushed a commit to branch ubuntu-14.04
in repository mariadb-5.5.
commit 28a18fefeba5f63a4065baa661441c9fe3a796ac
Merge: 3747036 95c6357
Author: Otto Kekäläinen <otto at seravo.fi>
Date: Thu Jul 21 22:49:36 2016 +0300
Merge tag 'upstream/5.5.50' into ubuntu-14.04
Upstream version 5.5.50
CMakeLists.txt | 6 +-
Docs/INFO_SRC | 10 +-
VERSION | 2 +-
client/mysql.cc | 4 +-
client/mysqladmin.cc | 11 +-
client/mysqlcheck.c | 34 +-
client/mysqldump.c | 45 +-
client/mysqlshow.c | 42 +-
client/mysqltest.cc | 5 +-
extra/mysql_waitpid.c | 7 +-
extra/yassl/src/log.cpp | 3 +-
include/CMakeLists.txt | 6 +
include/my_tree.h | 2 +-
include/myisam.h | 3 +-
include/violite.h | 2 +-
libmysqld/CMakeLists.txt | 10 +-
mysql-test/include/search_pattern_in_file.inc | 17 +-
mysql-test/mysql-test-run.pl | 5 +-
mysql-test/r/bigint.result | 6 +
mysql-test/r/ctype_recoding.result | 33 +-
mysql-test/r/ctype_utf8.result | 39 +
mysql-test/r/ctype_utf8mb4.result | 34 +
mysql-test/r/fulltext3.result | 12 +
mysql-test/r/insert_innodb.result | 15 +
mysql-test/r/kill_processlist-6619.result | 4 +-
mysql-test/r/locale.result | 28 +
mysql-test/r/openssl_1.result | 2 -
mysql-test/r/parser.result | 20 +
mysql-test/r/sp-threads.result | 9 +-
mysql-test/r/ssl_ca.result | 24 +
mysql-test/r/type_date.result | 7 +-
mysql-test/r/wait_timeout_not_windows.result | 3 +
mysql-test/suite/binlog/t/binlog_mdev342.test | 3 +-
mysql-test/suite/innodb/r/innodb-fk.result | 44 +
.../suite/innodb/r/innodb_corrupt_bit.result | 90 +-
mysql-test/suite/innodb/t/innodb-fk.test | 41 +
mysql-test/suite/innodb/t/innodb_corrupt_bit.test | 84 +-
mysql-test/suite/plugins/r/server_audit.result | 2 +-
.../plugins/r/thread_pool_server_audit.result | 2 +-
mysql-test/suite/rpl/t/rpl_mdev382.test | 3 +-
.../suite/storage_engine/alter_tablespace.test | 3 +-
mysql-test/t/bigint.test | 5 +
mysql-test/t/ctype_recoding.test | 28 +-
mysql-test/t/ctype_utf8.test | 23 +
mysql-test/t/ctype_utf8mb4.test | 20 +
mysql-test/t/fulltext3.test | 15 +
mysql-test/t/insert_innodb.test | 21 +
mysql-test/t/kill_processlist-6619.test | 2 +-
mysql-test/t/locale.test | 19 +
mysql-test/t/openssl_1.test | 1 -
mysql-test/t/parser.test | 12 +
mysql-test/t/partition_innodb_plugin.test | 6 +-
mysql-test/t/sp-threads.test | 9 +-
mysql-test/t/ssl_ca.test | 36 +
mysql-test/t/type_date.test | 1 +
mysql-test/t/wait_timeout_not_windows.test | 16 +
mysql-test/valgrind.supp | 89 +-
mysys/errors.c | 4 +-
mysys/mf_iocache.c | 1 +
mysys/my_context.c | 4 +-
mysys/my_write.c | 3 +-
mysys/testhash.c | 4 +-
mysys/tree.c | 3 +-
regex/split.c | 4 +
scripts/mysqld_multi.sh | 8 +-
sql-common/client.c | 22 +-
sql/field.cc | 1 +
sql/field.h | 28 +-
sql/gen_lex_hash.cc | 2 +
sql/item.cc | 17 +-
sql/item_cmpfunc.cc | 11 +-
sql/item_func.cc | 7 +-
sql/item_geofunc.cc | 5 +-
sql/item_timefunc.cc | 6 +-
sql/lex.h | 3 -
sql/log.cc | 2 +-
sql/log.h | 4 +-
sql/log_event.cc | 46 +-
sql/log_event_old.cc | 52 +-
sql/slave.cc | 4 +-
sql/slave.h | 4 +-
sql/sp_head.cc | 10 +-
sql/sql_connect.cc | 3 +-
sql/sql_lex.cc | 29 +-
sql/sql_locale.h | 2 +
sql/sql_parse.cc | 30 +-
sql/sql_parse.h | 3 +-
sql/sql_reload.cc | 3 +-
sql/sql_select.cc | 6 +-
sql/sql_table.cc | 2 +-
sql/sql_yacc.cc | 27584 +++++++++----------
sql/sql_yacc.h | 1832 +-
sql/sql_yacc.yy | 77 +-
sql/threadpool_unix.cc | 6 +-
storage/innobase/handler/ha_innodb.cc | 40 +-
storage/innobase/handler/handler0alter.cc | 35 +
storage/maria/ma_checkpoint.c | 18 +-
storage/maria/ma_loghandler.c | 11 +-
storage/maria/ma_pagecache.c | 34 +-
storage/maria/ma_pagecache.h | 38 +-
storage/maria/ma_servicethread.c | 51 +-
storage/maria/ma_servicethread.h | 7 +-
storage/maria/ma_sort.c | 346 +-
storage/maria/maria_def.h | 3 +-
storage/myisam/sort.c | 367 +-
storage/tokudb/ft-index/ft/logger/recover.cc | 6 +-
.../ft-index/ft/serialize/ft_node-serialize.cc | 2 +-
storage/tokudb/ft-index/ft/txn/txn.cc | 8 +-
storage/tokudb/ft-index/portability/toku_pthread.h | 19 -
.../src/tests/threaded_stress_test_helpers.h | 2 +-
storage/xtradb/dict/dict0crea.c | 4 +-
storage/xtradb/handler/ha_innodb.cc | 40 +-
storage/xtradb/handler/handler0alter.cc | 35 +
storage/xtradb/include/os0sync.h | 47 +-
storage/xtradb/include/univ.i | 4 +-
storage/xtradb/log/log0recv.c | 4 +-
storage/xtradb/os/os0file.c | 48 +-
vio/viosslfactories.c | 6 +-
win/packaging/extra.wxs.in | 18 +-
win/packaging/heidisql.cmake | 2 +-
120 files changed, 16341 insertions(+), 15711 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