Merge tag 'mysql-5.7.9' into mysql-5.7

Conflicts:
	mysql-test/suite/binlog/r/binlog_error_action.result
	mysql-test/suite/binlog/t/binlog_error_action.test
	mysql-test/suite/gcol/inc/gcol_ins_upd.inc
	mysql-test/suite/gcol/inc/gcol_select.inc
	mysql-test/suite/gcol/r/gcol_bugfixes.result
	mysql-test/suite/gcol/r/gcol_ins_upd_innodb.result
	mysql-test/suite/gcol/r/gcol_select_myisam.result
	mysql-test/suite/gcol/t/gcol_bugfixes.test
	mysql-test/suite/innodb/r/default_row_format_16k.result
	mysql-test/suite/innodb/r/virtual_purge.result
	mysql-test/suite/innodb/t/default_row_format_16k.test
	mysql-test/suite/innodb/t/virtual_purge.test
	packaging/rpm-oel/mysql.spec.in
	packaging/rpm-sles/mysql.spec.in
	sql/binlog.cc
	sql/sql_base.cc
	sql/sql_thd_internal_api.cc
	sql/sql_thd_internal_api.h
	storage/innobase/handler/ha_innodb.cc
	storage/innobase/handler/handler0alter.cc
	storage/innobase/include/trx0rec.h
	storage/innobase/row/row0upd.cc
	storage/innobase/srv/srv0srv.cc
	storage/innobase/trx/trx0rec.cc

Author: bjornmu