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/suite/parts/t/partition_smallint_innodb.test
+++ b/mysql-test/suite/parts/t/partition_smallint_innodb.test
--- a/mysql-test/suite/parts/t/partition_smallint_myisam.test
+++ b/mysql-test/suite/parts/t/partition_smallint_myisam.test
--- a/mysql-test/suite/parts/t/partition_tinyint_innodb.test
+++ b/mysql-test/suite/parts/t/partition_tinyint_innodb.test
--- a/mysql-test/suite/parts/t/partition_tinyint_myisam.test
+++ b/mysql-test/suite/parts/t/partition_tinyint_myisam.test
--- a/mysql-test/suite/rpl/r/rpl_heartbeat_basic.result
+++ b/mysql-test/suite/rpl/r/rpl_heartbeat_basic.result
--- a/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
+++ b/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
--- a/mysql-test/suite/sys_vars/t/secure_file_priv.test
+++ b/mysql-test/suite/sys_vars/t/secure_file_priv.test
--- a/mysql-test/suite/vcol/inc/vcol_trigger_sp.inc
+++ b/mysql-test/suite/vcol/inc/vcol_trigger_sp.inc
--- a/mysql-test/suite/vcol/r/vcol_misc.result
+++ b/mysql-test/suite/vcol/r/vcol_misc.result
--- a/mysql-test/suite/vcol/r/vcol_select_myisam.result
+++ b/mysql-test/suite/vcol/r/vcol_select_myisam.result
--- a/mysql-test/suite/vcol/r/vcol_trigger_sp_innodb.result
+++ b/mysql-test/suite/vcol/r/vcol_trigger_sp_innodb.result
--- a/mysql-test/suite/vcol/r/vcol_trigger_sp_myisam.result
+++ b/mysql-test/suite/vcol/r/vcol_trigger_sp_myisam.result
--- a/mysql-test/suite/vcol/r/wrong_arena.result
+++ b/mysql-test/suite/vcol/r/wrong_arena.result
--- a/mysql-test/suite/vcol/t/vcol_misc.test
+++ b/mysql-test/suite/vcol/t/vcol_misc.test
--- a/mysql-test/suite/vcol/t/vcol_select_myisam.test
+++ b/mysql-test/suite/vcol/t/vcol_select_myisam.test
--- a/mysql-test/suite/vcol/t/wrong_arena.test
+++ b/mysql-test/suite/vcol/t/wrong_arena.test
--- a/mysql-test/t/ctype_ucs.test
+++ b/mysql-test/t/ctype_ucs.test
--- a/mysql-test/t/ctype_utf16.test
+++ b/mysql-test/t/ctype_utf16.test
--- a/mysql-test/t/ctype_utf32.test
+++ b/mysql-test/t/ctype_utf32.test
--- a/mysql-test/t/derived.test
+++ b/mysql-test/t/derived.test