[Pkg-mysql-commits] [mariadb-5.5] 02/03: Merge tag 'upstream/5.5.58' into ubuntu-14.04
Otto Kekäläinen
otto at moszumanska.debian.org
Sun Dec 31 10:15:59 UTC 2017
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 28f81366d1e1cb6efc3a660da300560957939bc7
Merge: d84cded fa5f29e
Author: Otto Kekäläinen <otto at debian.org>
Date: Sat Dec 30 17:55:25 2017 +0200
Merge tag 'upstream/5.5.58' into ubuntu-14.04
Upstream version 5.5.58
# gpg: Signature made la 30. joulukuuta 2017 17.55.25 EET
# gpg: using RSA key BED8449FCEE8DA88
# gpg: Good signature from "Otto Kekäläinen <otto at seravo.fi>" [full]
# gpg: aka "Otto Kekäläinen <otto at kekalainen.net>" [full]
# gpg: aka "Otto Kekäläinen <otto at fsfe.org>" [full]
# gpg: aka "Otto Kekäläinen <otto at linux.com>" [full]
# gpg: aka "Otto Kekäläinen <otto.kekalainen at seravo.fi>" [full]
# gpg: aka "Otto Kekäläinen <otto at mariadb.org>" [undefined]
# gpg: aka "Otto Kekäläinen <otto at debian.org>" [undefined]
# gpg: aka "Otto Kekäläinen <otto at sange.fi>" [full]
Docs/INFO_SRC | 10 +-
VERSION | 2 +-
client/mysql.cc | 5 +-
client/mysqldump.c | 1 +
extra/my_print_defaults.c | 21 +-
extra/replace.c | 1 +
extra/yassl/README | 8 +
extra/yassl/include/openssl/ssl.h | 4 +-
extra/yassl/src/yassl_imp.cpp | 6 +-
extra/yassl/src/yassl_int.cpp | 14 +-
.../include/wait_for_slave_sql_error_and_skip.inc | 7 +
mysql-test/mysql-test-run.pl | 3 +-
mysql-test/r/alter_table.result | 52 +
mysql-test/r/case.result | 16 +
mysql-test/r/count_distinct.result | 25 +
mysql-test/r/ctype_ucs.result | 30 +
mysql-test/r/ctype_utf32.result | 15 +
mysql-test/r/ctype_utf8.result | 22 +
mysql-test/r/errors.result | 2 +-
mysql-test/r/func_in.result | 6 +
mysql-test/r/func_time.result | 34 +
mysql-test/r/log_tables-big.result | 9 +-
mysql-test/r/myisam.result | 9 +-
mysql-test/r/partition_datatype.result | 8 +-
mysql-test/r/ps.result | 143 +
mysql-test/r/read_only.result | 3 +
mysql-test/r/show_check.result | 4 +-
...ow_function_with_pad_char_to_full_length.result | 24 +
mysql-test/r/strict.result | 4 +-
mysql-test/r/subselect_mat_cost_bugs.result | 17 +
mysql-test/r/type_blob.result | 2 +-
mysql-test/r/type_varchar.result | 69 +
mysql-test/r/view.result | 3 -
mysql-test/suite/maria/maria.result | 9 +-
mysql-test/suite/maria/maria.test | 3 +-
.../suite/parts/r/partition_alter_maria.result | 18 +
.../suite/parts/t/partition_alter_maria.test | 18 +
mysql-test/suite/vcol/r/vcol_misc.result | 19 +
mysql-test/suite/vcol/t/vcol_misc.test | 20 +
mysql-test/t/alter_table.test | 41 +
mysql-test/t/case.test | 12 +
mysql-test/t/count_distinct.test | 29 +
mysql-test/t/ctype_ucs.test | 23 +
mysql-test/t/ctype_utf32.test | 13 +
mysql-test/t/ctype_utf8.test | 16 +
mysql-test/t/func_in.test | 8 +
mysql-test/t/func_time.test | 31 +
mysql-test/t/log_tables-big.test | 9 +-
mysql-test/t/myisam.test | 3 +-
mysql-test/t/partition_datatype.test | 8 +-
mysql-test/t/ps.test | 129 +
mysql-test/t/read_only.test | 5 +
...show_function_with_pad_char_to_full_length.test | 23 +
mysql-test/t/subselect_mat_cost_bugs.test | 19 +
mysql-test/t/type_varchar.test | 44 +
mysql-test/t/view.test | 5 +-
mysys/my_new.cc | 10 +
plugin/handler_socket/CMakeLists.txt | 6 +
plugin/server_audit/server_audit.c | 10 +-
scripts/CMakeLists.txt | 5 +
scripts/mysql_install_db.sh | 48 +-
sql-common/client.c | 1 +
sql/events.cc | 8 +-
sql/field.cc | 16 +-
sql/ha_partition.cc | 6 +-
sql/item.cc | 12 +-
sql/item.h | 4 +-
sql/item_func.cc | 2 +
sql/item_row.cc | 30 +-
sql/item_row.h | 1 +
sql/item_strfunc.cc | 4 +-
sql/item_subselect.cc | 6 +
sql/item_timefunc.cc | 15 +-
sql/item_timefunc.h | 10 +-
sql/log.cc | 5 +
sql/log_event.cc | 15 -
sql/opt_subselect.cc | 55 +-
sql/opt_sum.cc | 1 +
sql/partition_info.cc | 2 -
sql/slave.cc | 1 -
sql/sp_head.cc | 2 +-
sql/sql_admin.cc | 1 -
sql/sql_base.cc | 7 +-
sql/sql_base.h | 5 +-
sql/sql_class.h | 2 +-
sql/sql_const.h | 13 +-
sql/sql_derived.cc | 4 +-
sql/sql_do.cc | 2 +-
sql/sql_insert.cc | 14 +-
sql/sql_lex.cc | 4 +-
sql/sql_lex.h | 1 +
sql/sql_load.cc | 10 +-
sql/sql_parse.cc | 47 +-
sql/sql_partition.cc | 43 +-
sql/sql_partition.h | 3 +-
sql/sql_plugin.cc | 131 +-
sql/sql_prepare.cc | 10 +-
sql/sql_repl.cc | 1 +
sql/sql_select.cc | 23 +-
sql/sql_show.cc | 11 +-
sql/sql_table.cc | 47 +-
sql/sql_update.cc | 4 +-
sql/sql_yacc.cc | 8292 ++++++++++----------
sql/sql_yacc.yy | 10 +-
sql/table.h | 3 +-
sql/uniques.cc | 12 +-
storage/federated/ha_federated.cc | 3 +
storage/federatedx/federatedx_io_mysql.cc | 9 +-
storage/federatedx/ha_federatedx.cc | 2 +
storage/heap/hp_create.c | 2 +-
storage/heap/hp_extra.c | 1 +
storage/innobase/btr/btr0cur.c | 10 +-
storage/innobase/handler/ha_innodb.cc | 5 +-
storage/innobase/include/data0type.ic | 2 +-
storage/innobase/include/page0zip.ic | 2 +-
storage/innobase/row/row0mysql.c | 5 +-
storage/innobase/row/row0purge.c | 4 +-
storage/innobase/row/row0sel.c | 1 +
storage/maria/ma_extra.c | 3 +-
storage/maria/ma_key_recover.c | 1 +
storage/maria/ma_loghandler.c | 2 +-
storage/maria/ma_recovery.c | 2 +-
storage/myisam/mi_extra.c | 3 +-
storage/sphinx/ha_sphinx.cc | 12 +-
storage/tokudb/CMakeLists.txt | 1 +
.../tokudb/mysql-test/tokudb/r/type_blob.result | 2 +-
storage/xtradb/btr/btr0cur.c | 10 +-
storage/xtradb/handler/ha_innodb.cc | 5 +-
storage/xtradb/include/data0type.ic | 2 +-
storage/xtradb/include/page0zip.ic | 2 +-
storage/xtradb/include/univ.i | 2 +-
storage/xtradb/row/row0mysql.c | 4 +-
storage/xtradb/row/row0purge.c | 4 +-
storage/xtradb/row/row0sel.c | 1 +
storage/xtradb/trx/trx0sys.c | 2 +-
strings/ctype-utf8.c | 17 +-
strings/dtoa.c | 13 +-
137 files changed, 5682 insertions(+), 4511 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