diff options
| author | Jan Lindström <jplindst@mariadb.org> | 2014-04-16 12:13:43 +0300 |
|---|---|---|
| committer | Jan Lindström <jplindst@mariadb.org> | 2014-04-16 12:13:43 +0300 |
| commit | 150e88e8c9b85e3e6ce500a91fd215d231e99881 (patch) | |
| tree | e029a8c9beae4cf67edc5239694c68f8b4de28c0 /sql/handler.cc | |
| parent | 983366e0eef50b95329bcba154ee4fb38b85df3c (diff) | |
| parent | 142c20eda9d287f7f898dd8d89821f0e809dafc6 (diff) | |
| download | mariadb-git-150e88e8c9b85e3e6ce500a91fd215d231e99881.tar.gz | |
Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.
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 dc7e3cb3084..ad651e7de4a 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -3545,14 +3545,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 |