Merge tag 'upstream/5.5.54' into ubuntu-14.04

Upstream version 5.5.54

Merge tag 'upstream/5.5.54' into ubuntu-14.04
Upstream version 5.5.54
ac824fa5 · Otto Kekäläinen · 823a5cd5 · aa39e58b · ac824fa5 · ac824fa5
Commit ac824fa5 authored Jan 19, 2017 by Otto Kekäläinen
--- a/sql/log.cc
+++ b/sql/log.cc
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
--- a/sql/rpl_filter.cc
+++ b/sql/rpl_filter.cc
--- a/sql/signal_handler.cc
+++ b/sql/signal_handler.cc
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
--- a/sql/sql_connect.cc
+++ b/sql/sql_connect.cc
--- a/sql/sql_const.h
+++ b/sql/sql_const.h
--- a/sql/sql_derived.cc
+++ b/sql/sql_derived.cc
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
--- a/sql/sql_parse.h
+++ b/sql/sql_parse.h
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
--- a/sql/sql_time.cc
+++ b/sql/sql_time.cc
--- a/sql/sql_time.h
+++ b/sql/sql_time.h
--- a/sql/sql_udf.cc
+++ b/sql/sql_udf.cc
--- a/sql/sql_yacc.cc
+++ b/sql/sql_yacc.cc
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy