[Pkg-mysql-commits] [mariadb-5.5] 03/04: Merge tag 'upstream/5.5.52' into ubuntu-14.04
Otto Kekäläinen
otto at moszumanska.debian.org
Wed Sep 14 18:40:49 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 955e2819af13efe95f5c94bcfbc0129b06838c48
Merge: d6317e1 4d305fb
Author: Otto Kekäläinen <otto at seravo.fi>
Date: Wed Sep 14 20:55:04 2016 +0300
Merge tag 'upstream/5.5.52' into ubuntu-14.04
Upstream version 5.5.52
Docs/INFO_SRC | 10 +-
VERSION | 2 +-
client/mysqlcheck.c | 71 ++++-----
client/mysqlimport.c | 58 +++++--
include/my_sys.h | 4 +-
libmysqld/lib_sql.cc | 6 +
mysql-test/include/report-features.test | 12 --
mysql-test/mysql-test-run.pl | 18 ---
mysql-test/r/ctype_utf32.result | 3 +
mysql-test/r/func_group.result | 39 +++++
mysql-test/r/func_math.result | 12 ++
mysql-test/r/func_misc.result | 7 +
mysql-test/r/group_min_max_innodb.result | 16 ++
mysql-test/r/loaddata.result | 26 ++-
mysql-test/r/merge.result | 17 ++
mysql-test/r/myisam_enable_keys-10506.result | 114 ++++++++++++++
mysql-test/r/mysqlcheck.result | 81 +++++++++-
mysql-test/r/ps.result | 33 +++-
mysql-test/r/ps_1general.result | 2 +
mysql-test/r/range.result | 31 ++++
mysql-test/r/range_mrr_icp.result | 31 ++++
mysql-test/r/sp-prelocking.result | 20 +++
mysql-test/r/type_date.result | 2 +
mysql-test/r/type_uint.result | 19 +++
mysql-test/r/view.result | 15 ++
mysql-test/r/xtradb_mrr.result | 4 +-
mysql-test/std_data/bug20683959loaddata.txt | 1 +
.../r/binlog_dmls_on_tmp_tables_readonly.result | 58 +++++++
.../t/binlog_dmls_on_tmp_tables_readonly.test | 91 +++++++++++
.../suite/funcs_1/datadict/processlist_priv.inc | 2 +-
mysql-test/suite/innodb/r/innodb-fkcheck.result | 87 +++++++++++
mysql-test/suite/innodb/r/innodb_bug54044.result | 13 +-
mysql-test/suite/innodb/t/innodb-fkcheck.test | 115 ++++++++++++++
mysql-test/suite/innodb/t/innodb_bug54044.test | 10 +-
mysql-test/suite/perfschema/r/aggregate.result | 102 ------------
mysql-test/suite/perfschema/t/aggregate.test | 174 ---------------------
mysql-test/suite/plugins/r/pam_cleartext.result | 3 +
mysql-test/suite/plugins/t/pam.test | 3 +-
mysql-test/suite/plugins/t/pam_cleartext.test | 16 +-
.../suite/sys_vars/r/general_log_file_basic.result | 10 ++
.../sys_vars/r/slow_query_log_file_basic.result | 10 ++
.../suite/sys_vars/t/general_log_file_basic.test | 14 ++
.../sys_vars/t/slow_query_log_file_basic.test | 14 ++
mysql-test/t/ctype_utf32.test | 5 +
mysql-test/t/func_group.test | 31 ++++
mysql-test/t/func_math.test | 12 ++
mysql-test/t/func_misc.test | 10 ++
mysql-test/t/group_min_max_innodb.test | 13 ++
mysql-test/t/loaddata.test | 25 ++-
mysql-test/t/merge.test | 13 ++
mysql-test/t/myisam_enable_keys-10506.test | 117 ++++++++++++++
mysql-test/t/mysqlcheck.test | 52 +++++-
mysql-test/t/named_pipe.test | 9 ++
mysql-test/t/ps.test | 29 +++-
mysql-test/t/ps_1general.test | 7 +
mysql-test/t/range.test | 29 ++++
mysql-test/t/sp-prelocking.test | 26 +++
mysql-test/t/type_date.test | 15 +-
mysql-test/t/type_uint.test | 8 +
mysql-test/t/view.test | 15 ++
mysql-test/t/xtradb_mrr.test | 4 +-
mysys/my_context.c | 17 +-
mysys/my_redel.c | 7 +-
mysys/my_static.c | 1 +
plugin/feedback/url_http.cc | 1 +
regex/split.c | 4 +
scripts/mysql_secure_installation.pl.in | 2 +-
scripts/mysql_secure_installation.sh | 2 +-
sql/event_scheduler.cc | 33 +---
sql/field.cc | 2 +-
sql/handler.cc | 3 +-
sql/item.cc | 28 +++-
sql/item_func.cc | 3 +
sql/item_subselect.cc | 66 +++++---
sql/item_subselect.h | 39 +++--
sql/item_sum.cc | 4 +-
sql/mysqld.cc | 32 ++--
sql/net_serv.cc | 6 +-
sql/opt_range.cc | 2 +
sql/sql_admin.cc | 14 +-
sql/sql_base.cc | 11 +-
sql/sql_class.cc | 2 +
sql/sql_class.h | 8 +-
sql/sql_insert.cc | 2 +-
sql/sql_load.cc | 77 +++++----
sql/sql_plugin.cc | 126 +++++++--------
sql/sql_plugin.h | 2 +
sql/sql_select.cc | 30 +++-
sql/sql_show.cc | 19 ++-
sql/sql_union.cc | 6 +
sql/sys_vars.cc | 21 ++-
storage/innobase/dict/dict0crea.c | 8 +-
storage/innobase/handler/ha_innodb.cc | 3 +-
storage/innobase/include/os0sync.h | 11 +-
storage/innobase/include/row0mysql.h | 5 +-
storage/innobase/include/sync0sync.ic | 5 +
storage/innobase/page/page0cur.c | 20 +++
storage/innobase/row/row0merge.c | 2 +-
storage/innobase/row/row0mysql.c | 23 ++-
storage/innobase/trx/trx0roll.c | 2 +-
storage/myisam/ha_myisam.cc | 3 +-
storage/tokudb/ft-index/ft/txn/txn.cc | 15 +-
storage/xtradb/dict/dict0crea.c | 8 +-
storage/xtradb/handler/ha_innodb.cc | 4 +-
storage/xtradb/include/log0online.h | 4 +-
storage/xtradb/include/os0sync.h | 11 +-
storage/xtradb/include/row0mysql.h | 5 +-
storage/xtradb/include/sync0sync.ic | 5 +
storage/xtradb/include/univ.i | 2 +-
storage/xtradb/log/log0online.c | 4 +-
storage/xtradb/log/log0recv.c | 46 ++++--
storage/xtradb/page/page0cur.c | 20 +++
storage/xtradb/row/row0merge.c | 2 +-
storage/xtradb/row/row0mysql.c | 23 ++-
storage/xtradb/trx/trx0roll.c | 2 +-
strings/ctype-ucs2.c | 14 +-
strings/ctype-utf8.c | 8 +-
strings/decimal.c | 4 +
support-files/mysql.server.sh | 2 +-
win/packaging/CMakeLists.txt | 11 +-
win/packaging/create_msi.cmake.in | 1 +
121 files changed, 1923 insertions(+), 716 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