diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-08-29 18:50:38 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-08-29 18:50:38 -0700 |
| commit | 98f239a8494104743b4a7f2df5b8d7f310975689 (patch) | |
| tree | 4beee747e184ab6b7d873d936e244397e4f8b49d /sql/sql_class.h | |
| parent | d0ad93fbc7eca575364e46f67c4613efb0807047 (diff) | |
| parent | b45c551ee32d0d5260f4958abf93efab1a4614a2 (diff) | |
| download | mariadb-git-98f239a8494104743b4a7f2df5b8d7f310975689.tar.gz | |
Merge 5.5->5.5-mwl248.
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index b2fe8c21aae..b1e9b095be2 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1845,6 +1845,7 @@ public: MEM_ROOT mem_root; // Transaction-life memory allocation pool void cleanup() { + DBUG_ENTER("thd::cleanup"); changed_tables= 0; savepoints= 0; /* @@ -1856,6 +1857,7 @@ public: if (!xid_state.rm_error) xid_state.xid.null(); free_root(&mem_root,MYF(MY_KEEP_PREALLOC)); + DBUG_VOID_RETURN; } my_bool is_active() { |