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@seravo.fi>" [full] # gpg: aka "Otto Kekäläinen <otto@kekalainen.net>" [full] # gpg: aka "Otto Kekäläinen <otto@fsfe.org>" [full] # gpg: aka "Otto Kekäläinen <otto@linux.com>" [full] # gpg: aka "Otto Kekäläinen <otto.kekalainen@seravo.fi>" [full] # gpg: aka "Otto Kekäläinen <otto@mariadb.org>" [undefined] # gpg: aka "Otto Kekäläinen <otto@debian.org>" [undefined] # gpg: aka "Otto Kekäläinen <otto@sange.fi>" [full]

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@seravo.fi>" [full] # gpg: aka "Otto Kekäläinen <otto@kekalainen.net>" [full] # gpg: aka "Otto Kekäläinen <otto@fsfe.org>" [full] # gpg: aka "Otto Kekäläinen <otto@linux.com>" [full] # gpg: aka "Otto Kekäläinen <otto.kekalainen@seravo.fi>" [full] # gpg: aka "Otto Kekäläinen <otto@mariadb.org>" [undefined] # gpg: aka "Otto Kekäläinen <otto@debian.org>" [undefined] # gpg: aka "Otto Kekäläinen <otto@sange.fi>" [full]
7ebf5d93 · Otto Kekäläinen · 0aa16398 · 067768bd · 7ebf5d93 · 7ebf5d93
Commit 7ebf5d93 authored Jun 18, 2017 by Otto Kekäläinen
--- a/mysql-test/t/events_2.test
+++ b/mysql-test/t/events_2.test
--- a/mysql-test/t/grant.test
+++ b/mysql-test/t/grant.test
--- a/mysql-test/t/join_cache.test
+++ b/mysql-test/t/join_cache.test
--- a/mysql-test/t/join_nested.test
+++ b/mysql-test/t/join_nested.test
--- a/mysql-test/t/loaddata.test
+++ b/mysql-test/t/loaddata.test
--- a/mysql-test/t/log_slow.test
+++ b/mysql-test/t/log_slow.test
--- a/mysql-test/t/log_tables-big.test
+++ b/mysql-test/t/log_tables-big.test
--- a/mysql-test/t/mysqldump.test
+++ b/mysql-test/t/mysqldump.test
--- a/mysql-test/t/order_by.test
+++ b/mysql-test/t/order_by.test
--- a/mysql-test/t/partition_innodb.test
+++ b/mysql-test/t/partition_innodb.test
--- a/mysql-test/t/partition_myisam.test
+++ b/mysql-test/t/partition_myisam.test
--- a/mysql-test/t/pool_of_threads.cnf
+++ b/mysql-test/t/pool_of_threads.cnf
--- a/mysql-test/t/pool_of_threads.test
+++ b/mysql-test/t/pool_of_threads.test
--- a/mysql-test/t/ps.test
+++ b/mysql-test/t/ps.test
--- a/mysql-test/t/range_vs_index_merge.test
+++ b/mysql-test/t/range_vs_index_merge.test
--- a/mysql-test/t/repair_symlink-5543.test
+++ b/mysql-test/t/repair_symlink-5543.test
--- a/mysql-test/t/subselect4.test
+++ b/mysql-test/t/subselect4.test
--- a/mysql-test/t/subselect_innodb.test
+++ b/mysql-test/t/subselect_innodb.test
--- a/mysql-test/t/subselect_sj_mat.test
+++ b/mysql-test/t/subselect_sj_mat.test
--- a/mysql-test/t/symlink-aria-11902.test
+++ b/mysql-test/t/symlink-aria-11902.test