[Pkg-mysql-commits] [mariadb-5.5] 02/03: Merge tag 'upstream/5.5.56' into ubuntu-14.04
Otto Kekäläinen
otto at moszumanska.debian.org
Mon Jun 19 00:15:44 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 7ebf5d93a47c763ef1566afa8c49fa0f97e15ffe
Merge: 0aa1639 067768b
Author: Otto Kekäläinen <otto at seravo.fi>
Date: Sun Jun 18 16:40:44 2017 +0200
Merge tag 'upstream/5.5.56' into ubuntu-14.04
Upstream version 5.5.56
# gpg: Signature made su 18. kesäkuuta 2017 16.40.43 CEST
# 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]
.gitignore | 1 +
CMakeLists.txt | 19 +-
COPYING.LESSER | 516 ---------------------
Docs/INFO_SRC | 10 +-
VERSION | 2 +-
client/client_priv.h | 1 -
client/mysql.cc | 2 +-
client/mysql_upgrade.c | 3 +-
client/mysqladmin.cc | 2 +-
client/mysqlcheck.c | 2 +-
client/mysqldump.c | 10 +-
client/mysqlimport.c | 2 +-
client/mysqlshow.c | 2 +-
client/mysqlslap.c | 2 +-
client/mysqltest.cc | 30 +-
cmake/build_configurations/mysql_release.cmake | 2 +
cmake/cpack_rpm.cmake | 3 +
cmake/mysql_add_executable.cmake | 8 +
cmake/win_compatibility.manifest | 22 +
config.h.cmake | 18 -
extra/mysqld_safe_helper.c | 2 +-
include/my_sys.h | 13 +-
include/mysql/psi/mysql_file.h | 24 +-
include/welcome_copyright_notice.h | 6 +-
mysql-test/disabled.def | 1 -
mysql-test/lib/mtr_cases.pm | 4 +-
mysql-test/lib/mtr_report.pm | 3 +-
mysql-test/mysql-test-run.pl | 30 +-
mysql-test/r/ctype_ucs.result | 10 +
mysql-test/r/ctype_utf16.result | 10 +
mysql-test/r/ctype_utf32.result | 10 +
mysql-test/r/derived.result | 23 +
mysql-test/r/events_2.result | 4 +-
mysql-test/r/grant.result | 49 ++
mysql-test/r/innodb_icp,innodb_plugin.rdiff | 4 +-
mysql-test/r/innodb_icp.result | 2 +-
mysql-test/r/join_cache.result | 16 +-
mysql-test/r/join_nested.result | 95 ++++
mysql-test/r/join_nested_jcl6.result | 95 ++++
mysql-test/r/join_outer.result | 2 +-
mysql-test/r/join_outer_jcl6.result | 2 +-
mysql-test/r/loaddata.result | 20 +-
mysql-test/r/log_slow.result | 2 +-
mysql-test/r/log_tables-big.result | 14 +-
mysql-test/r/myisam_icp.result | 4 +-
mysql-test/r/mysqldump.result | 63 +++
mysql-test/r/order_by.result | 11 +
mysql-test/r/partition_innodb.result | 89 ++++
mysql-test/r/partition_myisam.result | 16 +
mysql-test/r/pool_of_threads.result | 21 +-
mysql-test/r/ps.result | 70 +++
mysql-test/r/range_vs_index_merge.result | 46 +-
...range_vs_index_merge_innodb,innodb_plugin.rdiff | 13 +-
mysql-test/r/range_vs_index_merge_innodb.result | 48 +-
mysql-test/r/subselect3.result | 8 +-
mysql-test/r/subselect3_jcl6.result | 8 +-
mysql-test/r/subselect4.result | 55 ++-
mysql-test/r/subselect_innodb.result | 31 +-
mysql-test/r/subselect_mat.result | 109 +++++
mysql-test/r/subselect_sj.result | 2 +-
mysql-test/r/subselect_sj_jcl6.result | 2 +-
mysql-test/r/subselect_sj_mat.result | 109 +++++
mysql-test/r/symlink-aria-11902.result | 39 ++
mysql-test/r/symlink-myisam-11902.result | 38 ++
mysql-test/r/symlink.result | 11 +
mysql-test/r/table_elim.result | 5 +-
mysql-test/r/view.result | 83 ++++
mysql-test/std_data/loaddata/mdev-11079.txt | 1 +
mysql-test/std_data/loaddata/mdev-11631.txt | 1 +
.../suite/federated/federated_bug_35333.result | 3 -
.../suite/federated/federated_bug_35333.test | 2 +-
mysql-test/suite/funcs_2/t/innodb_charset.test | 1 +
.../suite/innodb/r/innodb_bug14676111.result | 18 +-
.../suite/innodb/t/innodb_bug14676111-master.opt | 1 -
mysql-test/suite/innodb/t/innodb_bug14676111.test | 61 ++-
mysql-test/suite/maria/icp.result | 4 +-
.../suite/parts/r/partition_bigint_innodb.result | 121 +++++
.../suite/parts/r/partition_bigint_myisam.result | 121 +++++
...nnodb.result => partition_double_innodb.result} | 90 ----
...yisam.result => partition_double_myisam.result} | 90 ----
.../suite/parts/r/partition_float_innodb.result | 82 ----
.../suite/parts/r/partition_float_myisam.result | 82 ----
.../suite/parts/r/partition_int_innodb.result | 448 ------------------
.../suite/parts/r/partition_int_myisam.result | 448 ------------------
.../parts/r/partition_mediumint_innodb.result | 109 +++++
.../parts/r/partition_mediumint_myisam.result | 109 +++++
.../suite/parts/r/partition_smallint_innodb.result | 109 +++++
.../suite/parts/r/partition_smallint_myisam.result | 109 +++++
.../suite/parts/r/partition_tinyint_innodb.result | 109 +++++
.../suite/parts/r/partition_tinyint_myisam.result | 109 +++++
...nt_innodb.test => partition_bigint_innodb.test} | 12 +-
...nt_myisam.test => partition_bigint_myisam.test} | 12 +-
...at_innodb.test => partition_double_innodb.test} | 9 +-
...at_myisam.test => partition_double_myisam.test} | 9 +-
.../suite/parts/t/partition_float_innodb.test | 7 +-
.../suite/parts/t/partition_float_myisam.test | 7 +-
mysql-test/suite/parts/t/partition_int_innodb.test | 10 +-
mysql-test/suite/parts/t/partition_int_myisam.test | 10 +-
...innodb.test => partition_mediumint_innodb.test} | 12 +-
...myisam.test => partition_mediumint_myisam.test} | 12 +-
..._innodb.test => partition_smallint_innodb.test} | 12 +-
..._myisam.test => partition_smallint_myisam.test} | 12 +-
...t_innodb.test => partition_tinyint_innodb.test} | 12 +-
...t_myisam.test => partition_tinyint_myisam.test} | 12 +-
mysql-test/suite/rpl/r/rpl_heartbeat_basic.result | 3 +-
mysql-test/suite/rpl/t/rpl_heartbeat_basic.test | 46 +-
mysql-test/suite/sys_vars/t/secure_file_priv.test | 3 +
mysql-test/suite/vcol/inc/vcol_trigger_sp.inc | 9 +-
mysql-test/suite/vcol/r/vcol_misc.result | 7 +
mysql-test/suite/vcol/r/vcol_select_myisam.result | 109 +++++
.../suite/vcol/r/vcol_trigger_sp_innodb.result | 8 +-
.../suite/vcol/r/vcol_trigger_sp_myisam.result | 8 +-
mysql-test/suite/vcol/r/wrong_arena.result | 61 +++
mysql-test/suite/vcol/t/vcol_misc.test | 11 +
mysql-test/suite/vcol/t/vcol_select_myisam.test | 32 ++
mysql-test/suite/vcol/t/wrong_arena.test | 35 ++
mysql-test/t/ctype_ucs.test | 8 +
mysql-test/t/ctype_utf16.test | 9 +
mysql-test/t/ctype_utf32.test | 9 +
mysql-test/t/derived.test | 23 +
mysql-test/t/events_2.test | 2 +-
mysql-test/t/grant.test | 65 +++
mysql-test/t/join_cache.test | 10 +-
mysql-test/t/join_nested.test | 71 ++-
mysql-test/t/loaddata.test | 20 +-
mysql-test/t/log_slow.test | 2 +-
mysql-test/t/log_tables-big.test | 16 +-
mysql-test/t/mysqldump.test | 58 +++
mysql-test/t/order_by.test | 10 +
mysql-test/t/partition_innodb.test | 93 ++++
mysql-test/t/partition_myisam.test | 21 +
mysql-test/t/pool_of_threads.cnf | 3 -
mysql-test/t/pool_of_threads.test | 46 +-
mysql-test/t/ps.test | 33 ++
mysql-test/t/range_vs_index_merge.test | 41 +-
mysql-test/t/repair_symlink-5543.test | 4 +-
mysql-test/t/subselect4.test | 35 ++
mysql-test/t/subselect_innodb.test | 42 ++
mysql-test/t/subselect_sj_mat.test | 87 ++++
mysql-test/t/symlink-aria-11902.test | 6 +
mysql-test/t/symlink-myisam-11902.test | 60 +++
mysql-test/t/symlink.test | 16 +
mysql-test/t/table_elim.test | 4 +-
mysql-test/t/view.test | 60 +++
mysql-test/valgrind.supp | 29 +-
mysys/mf_format.c | 7 +-
mysys/my_context.c | 3 +-
mysys/my_create.c | 20 +-
mysys/my_delete.c | 11 +-
mysys/my_div.c | 2 +-
mysys/my_fopen.c | 18 +-
mysys/my_init.c | 2 +-
mysys/my_open.c | 41 +-
mysys/my_setuser.c | 3 +-
mysys/my_symlink.c | 84 ++++
mysys/my_symlink2.c | 47 +-
mysys/my_sync.c | 2 +-
mysys/my_thr_init.c | 13 +-
mysys/mysys_priv.h | 32 ++
packaging/rpm-oel/mysql.init | 34 +-
plugin/server_audit/server_audit.c | 36 +-
regex/regcomp.c | 24 +-
scripts/mysql_secure_installation.sh | 67 ++-
scripts/mysqld_safe.sh | 10 +-
sql-common/client.c | 15 +-
sql/debug_sync.cc | 2 +
sql/ha_partition.cc | 1 +
sql/handler.cc | 5 +-
sql/item.h | 5 +
sql/item_cmpfunc.cc | 27 +-
sql/item_cmpfunc.h | 12 +-
sql/item_func.cc | 7 +-
sql/item_func.h | 1 -
sql/item_strfunc.cc | 21 +-
sql/item_subselect.cc | 9 +-
sql/item_subselect.h | 8 +
sql/item_sum.cc | 2 +-
sql/item_xmlfunc.cc | 7 +-
sql/log_slow.h | 27 +-
sql/mysqld.cc | 2 +-
sql/opt_range.cc | 25 +-
sql/share/errmsg-utf8.txt | 2 +-
sql/sp.cc | 28 +-
sql/sp.h | 2 +-
sql/sql_acl.cc | 4 +-
sql/sql_base.cc | 16 +-
sql/sql_class.cc | 3 +-
sql/sql_class.h | 19 -
sql/sql_const.h | 1 +
sql/sql_db.cc | 6 +-
sql/sql_delete.cc | 5 +-
sql/sql_derived.cc | 3 +
sql/sql_join_cache.cc | 5 +
sql/sql_load.cc | 78 ++--
sql/sql_parse.cc | 53 ++-
sql/sql_parse.h | 3 +-
sql/sql_prepare.cc | 2 +-
sql/sql_select.cc | 109 +++--
sql/sql_table.cc | 17 +-
sql/sql_trigger.cc | 3 +
sql/sql_update.cc | 13 +-
sql/sys_vars.h | 2 +-
sql/table.cc | 19 +-
sql/table.h | 3 +-
storage/innobase/btr/btr0btr.c | 1 -
storage/innobase/btr/btr0cur.c | 8 +-
storage/innobase/buf/buf0buddy.c | 1 -
storage/innobase/buf/buf0buf.c | 10 +-
storage/innobase/dict/dict0crea.c | 10 +-
storage/innobase/dict/dict0dict.c | 1 -
storage/innobase/dict/dict0load.c | 11 +-
storage/innobase/dict/dict0mem.c | 2 +-
storage/innobase/dyn/dyn0dyn.c | 1 -
storage/innobase/fil/fil0fil.c | 100 ++--
storage/innobase/fsp/fsp0fsp.c | 5 -
storage/innobase/include/dict0dict.ic | 7 -
storage/innobase/include/dict0mem.h | 12 +-
storage/innobase/include/dyn0dyn.ic | 10 -
storage/innobase/include/fsp0fsp.h | 2 +-
storage/innobase/include/log0recv.h | 3 +
storage/innobase/include/mach0data.ic | 13 -
storage/innobase/include/mtr0mtr.ic | 1 -
storage/innobase/include/page0page.ic | 1 -
storage/innobase/include/rem0rec.ic | 1 -
storage/innobase/include/sync0sync.h | 1 +
storage/innobase/include/ut0lst.h | 3 -
storage/innobase/log/log0log.c | 11 +
storage/innobase/log/log0recv.c | 105 ++---
storage/innobase/mtr/mtr0mtr.c | 1 -
storage/innobase/os/os0file.c | 86 ++--
storage/innobase/page/page0page.c | 2 -
storage/innobase/page/page0zip.c | 1 -
storage/innobase/rem/rem0rec.c | 3 +-
storage/innobase/row/row0merge.c | 12 -
storage/innobase/row/row0purge.c | 3 -
storage/innobase/row/row0upd.c | 4 -
storage/innobase/srv/srv0srv.c | 7 +-
storage/innobase/trx/trx0roll.c | 4 +
storage/innobase/trx/trx0trx.c | 1 -
storage/maria/ha_maria.cc | 230 +++++----
storage/maria/ma_check.c | 6 +-
storage/maria/ma_create.c | 57 +--
storage/maria/ma_delete_table.c | 11 +-
storage/maria/ma_open.c | 66 ++-
storage/maria/ma_static.c | 6 -
storage/maria/maria_chk.c | 2 +-
storage/maria/maria_def.h | 3 +-
storage/myisam/ha_myisam.cc | 215 ++++-----
storage/myisam/mi_check.c | 18 +-
storage/myisam/mi_create.c | 53 ++-
storage/myisam/mi_delete_table.c | 34 +-
storage/myisam/mi_open.c | 66 ++-
storage/myisam/mi_static.c | 8 -
storage/myisam/myisamchk.c | 2 +-
storage/myisam/myisamdef.h | 3 +-
storage/tokudb/mysql-test/tokudb_bugs/t/xa-3.test | 1 +
storage/tokudb/mysql-test/tokudb_bugs/t/xa-4.test | 1 +
storage/tokudb/mysql-test/tokudb_bugs/t/xa-6.test | 1 +
storage/xtradb/btr/btr0btr.c | 1 -
storage/xtradb/btr/btr0cur.c | 10 +-
storage/xtradb/buf/buf0buddy.c | 1 -
storage/xtradb/buf/buf0buf.c | 10 +-
storage/xtradb/dict/dict0crea.c | 10 +-
storage/xtradb/dict/dict0dict.c | 1 -
storage/xtradb/dict/dict0load.c | 10 +-
storage/xtradb/dict/dict0mem.c | 2 +-
storage/xtradb/dyn/dyn0dyn.c | 1 -
storage/xtradb/fil/fil0fil.c | 97 ++--
storage/xtradb/fsp/fsp0fsp.c | 5 -
storage/xtradb/include/btr0sea.ic | 4 -
storage/xtradb/include/dict0dict.ic | 7 -
storage/xtradb/include/dict0mem.h | 12 +-
storage/xtradb/include/dyn0dyn.ic | 10 -
storage/xtradb/include/fsp0fsp.h | 2 +-
storage/xtradb/include/log0recv.h | 3 +
storage/xtradb/include/mach0data.ic | 13 -
storage/xtradb/include/mtr0mtr.ic | 1 -
storage/xtradb/include/page0page.ic | 1 -
storage/xtradb/include/rem0rec.ic | 1 -
storage/xtradb/include/trx0trx.h | 1 +
storage/xtradb/include/ut0lst.h | 3 -
storage/xtradb/log/log0log.c | 11 +
storage/xtradb/log/log0recv.c | 113 ++---
storage/xtradb/mtr/mtr0mtr.c | 1 -
storage/xtradb/os/os0file.c | 80 ++--
storage/xtradb/page/page0page.c | 2 -
storage/xtradb/page/page0zip.c | 1 -
storage/xtradb/rem/rem0rec.c | 3 +-
storage/xtradb/row/row0merge.c | 12 -
storage/xtradb/row/row0purge.c | 3 -
storage/xtradb/row/row0upd.c | 4 -
storage/xtradb/trx/trx0trx.c | 1 -
support-files/CMakeLists.txt | 6 +-
support-files/SELinux/CMakeLists.txt | 35 ++
support-files/SELinux/mariadb.te | 9 +
.../mysql.fc => SELinux/rhel4-mysql.fc} | 0
.../mysql.te => SELinux/rhel4-mysql.te} | 0
support-files/build-tags | 20 +-
support-files/mysql.server.sh | 10 +-
support-files/rpm/server-postin.sh | 28 +-
tests/mysql_client_test.c | 50 +-
win/packaging/CMakeLists.txt | 2 +-
302 files changed, 4899 insertions(+), 3523 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