diff options
| author | unknown <knielsen@knielsen-hq.org> | 2014-04-11 10:46:11 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2014-04-11 10:46:11 +0200 |
| commit | be785cd85ce73d5927365c1c34e3c5b54db83231 (patch) | |
| tree | ce79e520a7d13e27e4c656ac87074bea193bcf5f /sql/handler.cc | |
| parent | 16d90e5aff742cf20a8ffb9283103b0bf6b5d938 (diff) | |
| parent | 65f80d4052e48accab9b152d7368b7aa0ccc3c80 (diff) | |
| download | mariadb-git-be785cd85ce73d5927365c1c34e3c5b54db83231.tar.gz | |
Merge MDEV-6067 from 5.3 to 5.5.
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 2e038be0092..b67bb5e9f66 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -3474,14 +3474,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 |