diff options
| author | unknown <knielsen@knielsen-hq.org> | 2014-04-11 08:39:48 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2014-04-11 08:39:48 +0200 |
| commit | 68bad3c7c0a0f0babcb18590d1cb2c6a2873eb15 (patch) | |
| tree | 466f0b7125012152ba54f80c9c02648e94a1ecba /sql/handler.cc | |
| parent | e772cbd7b774add42821c33b13ea052f8c9e2e6e (diff) | |
| download | mariadb-git-68bad3c7c0a0f0babcb18590d1cb2c6a2873eb15.tar.gz | |
MDEV-6067: Partitioned table DML sometimes binlogged without XID event
Revert the old patch revid:monty@askmonty.org-20100325133339-7mkel6valai0b4lb
This patch caused the InnoDB part of the transaction to not be marked
read-write in some cases, which messes up XA commit (and likely other
stuff as well).
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index eb53cfb76a7..9e4ac52656d 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -3245,14 +3245,11 @@ int handler::ha_check(THD *thd, HA_CHECK_OPT *check_opt) if it is started. */ +inline void -handler::mark_trx_read_write_part2() +handler::mark_trx_read_write() { Ha_trx_info *ha_info= &ha_thd()->ha_data[ht->slot].ha_info[0]; - - /* Don't call this function again for this statement */ - mark_trx_done= TRUE; - /* When a storage engine method is called, the transaction must have been started, unless it's a DDL call, for which the |