Post-merge fixes.


sql/log.cc:
  Need to set up binlog_trx_data regardless of whether row-based is
  enabled or not.