diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-05-06 02:02:08 +0400 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-05-06 02:02:08 +0400 |
| commit | 9e62cf67b3cf0b92e4f57d49149000d640963bed (patch) | |
| tree | e68e344b9f436b051706e830672ac8fbaa869662 /sql/sql_rename.cc | |
| parent | b47e4fbf834b260924d0eb15067f318f00dfbecd (diff) | |
| download | mariadb-git-9e62cf67b3cf0b92e4f57d49149000d640963bed.tar.gz | |
Clean-up, give better names, add comments to
thd->in_multi_stmt_transaction() and thd->active_transaction().
include/mysql_com.h:
Comment SERVER_STATUS_IN_TRANS flag.
sql/ha_ndbcluster.cc:
Rename: thd->in_multi_stmt_transaction() ->
thd->in_multi_stmt_transaction_mode().
sql/handler.cc:
Add comments.
sql/log.cc:
Rename: thd->in_multi_stmt_transaction() ->
thd->in_multi_stmt_transaction_mode().
sql/log_event.cc:
Rename: thd->in_multi_stmt_transaction() ->
thd->in_multi_stmt_transaction_mode().
sql/sql_base.cc:
Rename: thd->in_multi_stmt_transaction() ->
thd->in_multi_stmt_transaction_mode().
sql/sql_cache.cc:
Rename: thd->active_transaction() ->
thd->in_active_multi_stmt_transaction().
sql/sql_class.cc:
Rename: thd->in_multi_stmt_transaction() ->
thd->in_multi_stmt_transaction_mode().
sql/sql_class.h:
Rename and comment two transaction processing- related methods.
sql/sql_parse.cc:
Rename: thd->in_multi_stmt_transaction() ->
thd->in_multi_stmt_transaction_mode().
Rename: thd->active_transaction() ->
thd->in_active_multi_stmt_transaction().
sql/sql_prepare.cc:
Rename: thd->in_multi_stmt_transaction() ->
thd->in_multi_stmt_transaction_mode().
sql/sql_rename.cc:
Rename: thd->active_transaction() ->
thd->in_active_multi_stmt_transaction().
sql/sql_table.cc:
Rename: thd->active_transaction() ->
thd->in_active_multi_stmt_transaction().
sql/sys_vars.cc:
Rename: thd->active_transaction() ->
thd->in_active_multi_stmt_transaction().
sql/transaction.cc:
Rename: thd->in_multi_stmt_transaction() ->
thd->in_multi_stmt_transaction_mode().
Rename: thd->active_transaction() ->
thd->in_active_multi_stmt_transaction().
Diffstat (limited to 'sql/sql_rename.cc')
| -rw-r--r-- | sql/sql_rename.cc | 2 |
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)); |