diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-08-10 10:34:54 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-08-10 10:34:54 -0400 |
| commit | 38a0def80588dd8a093af3e225101365c74e0faa (patch) | |
| tree | 57ac2c3d59b2e7fefc37fdc9763715ee74d90ca2 /sql/handler.cc | |
| parent | 44e3046d3b09a21e21295979d6ddad9f332ebadd (diff) | |
| parent | 5ad02062d928cccbd29c0a2db6f0f7ceb33195d1 (diff) | |
| download | mariadb-git-38a0def80588dd8a093af3e225101365c74e0faa.tar.gz | |
Merge tag 'mariadb-5.5.51' into 5.5-galera
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 970c177fee2..0b00572a8dd 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -1241,7 +1241,8 @@ int ha_commit_trans(THD *thd, bool all) uint rw_ha_count= ha_check_and_coalesce_trx_read_only(thd, ha_info, all); /* rw_trans is TRUE when we in a transaction changing data */ - bool rw_trans= is_real_trans && (rw_ha_count > 0); + bool rw_trans= is_real_trans && + (rw_ha_count > !thd->is_current_stmt_binlog_disabled()); MDL_request mdl_request; if (rw_trans) |