diff options
| author | unknown <knielsen@knielsen-hq.org> | 2014-04-11 09:38:55 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2014-04-11 09:38:55 +0200 |
| commit | 65f80d4052e48accab9b152d7368b7aa0ccc3c80 (patch) | |
| tree | 5ea2576ea013e1879875065ac41d0b256f35a825 /sql/handler.cc | |
| parent | 63d0918807739dd19578ce9db80acbfd8ea158e6 (diff) | |
| parent | a1ae8f9ba86bf3967b0b55439c306ff611913345 (diff) | |
| download | mariadb-git-65f80d4052e48accab9b152d7368b7aa0ccc3c80.tar.gz | |
Merge MDEV-6067 from 5.2 to 5.3.
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 630a966f4ff..bcf051deb62 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -3335,14 +3335,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 |