diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-01-02 21:46:33 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-01-02 21:46:33 -0700 |
| commit | 1cf31b8537ae262fc8f1c327741afe20925361bc (patch) | |
| tree | d63ad5159963d391188f54a2b4f70e730e370b82 /sql | |
| parent | 2218bce9cc1ac5bac5d1b27362ff55663768e4c2 (diff) | |
| download | mariadb-git-1cf31b8537ae262fc8f1c327741afe20925361bc.tar.gz | |
show_check.test fixed cleanup problem
rpl000014.test fixed bug in testcase
rename.test fixed cleanup problem
handler.cc added a comment
sql_class.h fixed bug in active_transaction() when MySQL was not compiled with transaction support
mysql-test/t/rename.test:
fixed cleanup problem
mysql-test/t/rpl000014.test:
fixed bug in testcase
mysql-test/t/show_check.test:
fixed cleanup problem
sql/handler.cc:
added a comment
sql/sql_class.h:
fixed bug in active_transaction() when MySQL was not compiled with transaction support
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/handler.cc | 2 | ||||
| -rw-r--r-- | sql/sql_class.h | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 08cc3db7628..affd9df8f87 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -241,7 +241,7 @@ int ha_commit_trans(THD *thd, THD_TRANS* trans) #endif if (error && trans == &thd->transaction.all && mysql_bin_log.is_open()) sql_print_error("Error: Got error during commit; Binlog is not up to date!"); -#endif +#endif // using transactions DBUG_RETURN(error); } diff --git a/sql/sql_class.h b/sql/sql_class.h index bd295be101c..46c37e1b57f 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -299,9 +299,14 @@ public: } inline bool active_transaction() { +#ifdef USING_TRANSACTIONS return (transaction.all.bdb_tid != 0 || transaction.all.innobase_tid != 0 || transaction.all.gemini_tid != 0); +#else + return 0; +#endif + } inline gptr alloc(unsigned int size) { return alloc_root(&mem_root,size); } inline gptr calloc(unsigned int size) |