[Pkg-mysql-commits] [mariadb-5.5] 02/03: Merge tag 'upstream/5.5.57' into ubuntu-14.04
Otto Kekäläinen
otto at moszumanska.debian.org
Mon Jul 24 05:53:31 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 dd1c1c1ba8839e7abc6b9dd177836398d7f6135e
Merge: fb3d7b9 69b6b89
Author: Otto Kekäläinen <otto at debian.org>
Date: Sun Jul 23 23:35:35 2017 +0300
Merge tag 'upstream/5.5.57' into ubuntu-14.04
Upstream version 5.5.57
# gpg: Signature made su 23. heinäkuuta 2017 23.35.34 EEST
# 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 | 98 +-
client/mysqltest.cc | 34 +-
cmake/cpack_rpm.cmake | 7 +-
cmake/ssl.cmake | 7 +-
include/my_global.h | 6 +-
include/my_sys.h | 2 +-
include/mysql_com.h | 2 +
libmysql/libmysql.c | 3 +-
mysql-test/mysql-test-run.pl | 5 +-
mysql-test/r/binary_to_hex.result | 117 +
mysql-test/r/count_distinct.result | 12 +
mysql-test/r/derived_view.result | 59 +
mysql-test/r/group_by.result | 27 +
mysql-test/r/join_outer.result | 95 +
mysql-test/r/join_outer_jcl6.result | 95 +
mysql-test/r/limit_rows_examined.result | 5 +-
mysql-test/r/loadxml.result | 16 +-
mysql-test/r/mysql.result | 58 +
mysql-test/r/mysqltest.result | 5 +
mysql-test/r/read_only.result | 2 +
mysql-test/r/subselect.result | 30 +
mysql-test/r/subselect_mat.result | 88 +
mysql-test/r/subselect_mat_cost_bugs.result | 102 +
mysql-test/r/subselect_no_mat.result | 30 +
mysql-test/r/subselect_no_opts.result | 30 +
mysql-test/r/subselect_no_scache.result | 30 +
mysql-test/r/subselect_no_semijoin.result | 30 +
mysql-test/r/subselect_nulls.result | 6 +
mysql-test/r/subselect_sj.result | 95 +-
mysql-test/r/subselect_sj2_mat.result | 45 +
mysql-test/r/subselect_sj_jcl6.result | 95 +-
mysql-test/r/subselect_sj_mat.result | 88 +
mysql-test/r/union.result | 18 +
mysql-test/r/view.result | 14 +
mysql-test/std_data/loadxml.dat | 8 +-
mysql-test/suite/parts/r/longname.result | 33 +
mysql-test/suite/parts/r/quoting.result | 6 +
mysql-test/suite/parts/t/longname.test | 29 +
mysql-test/suite/parts/t/quoting.test | 10 +
.../suite/perfschema/include/have_timer_cycle.inc | 4 +
mysql-test/suite/perfschema/r/privilege.result | 8 +-
.../suite/perfschema/t/dml_performance_timers.test | 1 +
.../suite/perfschema/t/dml_setup_timers.test | 1 +
mysql-test/suite/perfschema/t/privilege.test | 14 +-
mysql-test/suite/rpl/r/rpl_mdev-11092.result | 17 +
mysql-test/suite/rpl/r/rpl_reset_slave_fail.result | 29 +
mysql-test/suite/rpl/t/rpl_mdev-11092.opt | 1 +
mysql-test/suite/rpl/t/rpl_mdev-11092.test | 53 +
mysql-test/suite/rpl/t/rpl_reset_slave_fail.test | 91 +
mysql-test/t/binary_to_hex.test | 76 +
mysql-test/t/bootstrap.test | 6 +
mysql-test/t/count_distinct.test | 16 +
mysql-test/t/derived_view.test | 50 +
mysql-test/t/group_by.test | 38 +
mysql-test/t/join_outer.test | 82 +
mysql-test/t/mysql.test | 30 +
mysql-test/t/mysqltest.test | 8 +-
mysql-test/t/read_only.test | 3 +
mysql-test/t/subselect.test | 35 +
mysql-test/t/subselect_mat_cost_bugs.test | 99 +
mysql-test/t/subselect_nulls.test | 6 +
mysql-test/t/subselect_sj.test | 72 +
mysql-test/t/subselect_sj2_mat.test | 40 +
mysql-test/t/subselect_sj_mat.test | 207 +
mysql-test/t/union.test | 15 +
mysql-test/t/view.test | 16 +
mysys/my_fopen.c | 2 +-
mysys/my_rdtsc.c | 25 +
mysys/my_symlink.c | 2 +-
mysys/mysys_priv.h | 11 +-
mysys/stacktrace.c | 2 +-
plugin/semisync/semisync_master.cc | 6 +-
scripts/CMakeLists.txt | 11 +-
scripts/dheadgen.pl | 8 +-
scripts/mysql_config.pl.in | 4 +-
scripts/mysql_convert_table_format.sh | 5 +-
scripts/mysql_find_rows.sh | 5 +-
scripts/mysql_fix_extensions.sh | 5 +-
scripts/mysql_install_db.pl.in | 4 +-
scripts/mysql_secure_installation.pl.in | 7 +-
scripts/mysql_setpermission.sh | 5 +-
scripts/mysql_zap.sh | 5 +-
scripts/mysqlaccess.sh | 19 +-
scripts/mysqld_multi.sh | 22 +-
scripts/mysqldumpslow.sh | 5 +-
scripts/mysqlhotcopy.sh | 4 +-
sql/ha_partition.cc | 195 +-
sql/item.cc | 12 +-
sql/item_func.h | 29 +-
sql/item_subselect.cc | 29 +-
sql/item_subselect.h | 10 +-
sql/item_sum.h | 1 +
sql/item_timefunc.cc | 2 +-
sql/log.cc | 7 +
sql/net_serv.cc | 2 +-
sql/opt_subselect.cc | 114 +-
sql/opt_sum.cc | 9 +
sql/records.cc | 1 +
sql/rpl_handler.cc | 2 +-
sql/rpl_mi.cc | 11 +-
sql/rpl_rli.cc | 52 +-
sql/rpl_rli.h | 12 +-
sql/slave.cc | 6 +-
sql/sql_class.cc | 4 +-
sql/sql_derived.cc | 4 +-
sql/sql_lex.cc | 1 +
sql/sql_lex.h | 5 +
sql/sql_load.cc | 2 +-
sql/sql_parse.cc | 31 +-
sql/sql_partition.cc | 158 +-
sql/sql_partition.h | 12 +-
sql/sql_plugin.cc | 20 +-
sql/sql_priv.h | 2 +-
sql/sql_repl.cc | 5 +-
sql/sql_select.cc | 107 +-
sql/sql_select.h | 8 +
sql/sql_union.cc | 18 +-
sql/sql_yacc.cc | 18876 ++++++++-----------
sql/sql_yacc.h | 1283 +-
sql/sys_vars.cc | 4 +
sql/threadpool_unix.cc | 14 +-
sql/uniques.cc | 14 +-
storage/archive/ha_archive.cc | 1 -
storage/innobase/buf/buf0buf.c | 6 -
storage/maria/ma_check.c | 4 +-
storage/maria/ma_loghandler.c | 29 +-
storage/maria/ma_pagecache.c | 1 +
storage/maria/ma_recovery.c | 4 +-
storage/myisam/mi_check.c | 4 +-
.../mysql-test/storage_engine/parts/disabled.def | 0
storage/xtradb/btr/btr0btr.c | 2 +-
storage/xtradb/buf/buf0buf.c | 6 -
storage/xtradb/dict/dict0crea.c | 4 +-
storage/xtradb/fsp/fsp0fsp.c | 7 +-
storage/xtradb/handler/i_s.cc | 24 +-
storage/xtradb/include/btr0cur.h | 13 +-
storage/xtradb/include/btr0sea.h | 7 +-
storage/xtradb/include/buf0buddy.ic | 2 +-
storage/xtradb/include/buf0buf.h | 3 +-
storage/xtradb/include/dict0dict.h | 16 +-
storage/xtradb/include/dyn0dyn.h | 18 +-
storage/xtradb/include/dyn0dyn.ic | 2 +-
storage/xtradb/include/log0online.h | 20 +-
storage/xtradb/include/mach0data.h | 16 +-
storage/xtradb/include/mtr0mtr.h | 5 +-
storage/xtradb/include/os0file.h | 5 +-
storage/xtradb/include/page0page.h | 18 +-
storage/xtradb/include/page0zip.h | 5 +-
storage/xtradb/include/rem0rec.h | 3 +-
storage/xtradb/include/row0upd.h | 5 +-
storage/xtradb/include/trx0trx.h | 4 +-
storage/xtradb/include/univ.i | 4 +-
storage/xtradb/log/log0online.c | 148 +-
storage/xtradb/mach/mach0data.c | 44 +-
storage/xtradb/os/os0file.c | 49 +-
storage/xtradb/rem/rem0rec.c | 2 +-
storage/xtradb/row/row0merge.c | 4 +-
storage/xtradb/row/row0purge.c | 2 +-
storage/xtradb/srv/srv0srv.c | 9 +-
storage/xtradb/srv/srv0start.c | 2 +
storage/xtradb/trx/trx0roll.c | 4 +
163 files changed, 11829 insertions(+), 12364 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