sql/sql_class.h:
  update tmp_disable_binlog() and reenable_binlog() macros
mysql-test/r/insert_select.result:
  Handle results that differ from 4.0 to 4.1