summaryrefslogtreecommitdiff
path: root/sql/sql_rename.cc
diff options
context:
space:
mode:
authorKonstantin Osipov <kostja@sun.com>2010-05-06 02:02:08 +0400
committerKonstantin Osipov <kostja@sun.com>2010-05-06 02:02:08 +0400
commitcca59e83d7a309729f0e079682d1dfa34bbd768e (patch)
treee68e344b9f436b051706e830672ac8fbaa869662 /sql/sql_rename.cc
parent24a14875bc19d2959393aec9dbfe4b098b73b592 (diff)
downloadmariadb-git-cca59e83d7a309729f0e079682d1dfa34bbd768e.tar.gz
Clean-up, give better names, add comments to
thd->in_multi_stmt_transaction() and thd->active_transaction().
Diffstat (limited to 'sql/sql_rename.cc')
-rw-r--r--sql/sql_rename.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_rename.cc b/sql/sql_rename.cc
index d387010141c..ea95b59b0c2 100644
--- a/sql/sql_rename.cc
+++ b/sql/sql_rename.cc
@@ -54,7 +54,7 @@ bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list, bool silent)
if the user is trying to to do this in a transcation context
*/
- if (thd->locked_tables_mode || thd->active_transaction())
+ if (thd->locked_tables_mode || thd->in_active_multi_stmt_transaction())
{
my_message(ER_LOCK_OR_ACTIVE_TRANSACTION,
ER(ER_LOCK_OR_ACTIVE_TRANSACTION), MYF(0));