Merge tag 'upstream/5.5.49' into ubuntu-14.04

Upstream version 5.5.49

Merge tag 'upstream/5.5.49' into ubuntu-14.04
Upstream version 5.5.49
9f8aec7a · Otto Kekäläinen · 516ad142 · d97fe3f6 · 9f8aec7a · 9f8aec7a
Commit 9f8aec7a authored Apr 22, 2016 by Otto Kekäläinen
--- a/mysql-test/t/create.test
+++ b/mysql-test/t/create.test
--- a/mysql-test/t/ctype_cp850.test
+++ b/mysql-test/t/ctype_cp850.test
--- a/mysql-test/t/ctype_utf8.test
+++ b/mysql-test/t/ctype_utf8.test
--- a/mysql-test/t/ctype_utf8mb4.test
+++ b/mysql-test/t/ctype_utf8mb4.test
--- a/mysql-test/t/derived.test
+++ b/mysql-test/t/derived.test
--- a/mysql-test/t/events_2.test
+++ b/mysql-test/t/events_2.test
--- a/mysql-test/t/func_math.test
+++ b/mysql-test/t/func_math.test
--- a/mysql-test/t/func_time.test
+++ b/mysql-test/t/func_time.test
--- a/mysql-test/t/insert_innodb.test
+++ b/mysql-test/t/insert_innodb.test
--- a/mysql-test/t/kill_processlist-6619.test
+++ b/mysql-test/t/kill_processlist-6619.test
--- a/mysql-test/t/locale.test
+++ b/mysql-test/t/locale.test
--- a/mysql-test/t/mdev6830-master.opt
+++ b/mysql-test/t/mdev6830-master.opt
--- a/mysql-test/t/mdev6830.test
+++ b/mysql-test/t/mdev6830.test
--- a/mysql-test/t/merge_innodb.test
+++ b/mysql-test/t/merge_innodb.test
--- a/mysql-test/t/mysql_upgrade_view.test
+++ b/mysql-test/t/mysql_upgrade_view.test
--- a/mysql-test/t/mysqldump.test
+++ b/mysql-test/t/mysqldump.test
--- a/mysql-test/t/second_frac-9175.test
+++ b/mysql-test/t/second_frac-9175.test
--- a/mysql-test/t/select_debug.test
+++ b/mysql-test/t/select_debug.test
--- a/mysql-test/t/set_password_plugin-9835.test
+++ b/mysql-test/t/set_password_plugin-9835.test
--- a/mysql-test/t/ssl_cert_verify.test
+++ b/mysql-test/t/ssl_cert_verify.test