merge with 5.0


sql/sql_class.cc:
  THD::binlog_query receives killed status arg with default the same for Query_log_event
sql/sql_class.h:
  relocation public binlog_query down to the point where killed_state is declared