diff options
| author | monty@hundin.mysql.fi <> | 2001-08-21 20:06:00 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-08-21 20:06:00 +0300 |
| commit | 063a1a6557ad2c501f4da9a47e633fb191ee2e00 (patch) | |
| tree | cc0b5646a48d97a66571d12ba2d4c29f6c1059e5 /sql/sql_class.h | |
| parent | 301af97d4a1e09ce7da0d8ee63c13210a786891d (diff) | |
| download | mariadb-git-063a1a6557ad2c501f4da9a47e633fb191ee2e00.tar.gz | |
Portability fixes.
Patches required by Gemini
Fix to properly detect if there is an active transaction in InnoDB
Fix to not lock thread structure when doing automatic rollback when thread ends
Allow -O lower_case_names=0 on UNIX
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 4ccbeb6f01f..bbf6fe08d88 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -283,7 +283,7 @@ public: bool no_errors, allow_sum_func, password, fatal_error; bool query_start_used,last_insert_id_used,insert_id_used; bool system_thread,in_lock_tables,global_read_lock; - bool query_error, bootstrap; + bool query_error, bootstrap, cleanup_done; bool volatile killed; LOG_INFO* current_linfo; // if we do a purge of binary logs, log index info of the threads @@ -295,6 +295,7 @@ public: THD(); ~THD(); + void cleanup(void); bool store_globals(); #ifdef SIGNAL_WITH_VIO_CLOSE inline void set_active_vio(Vio* vio) @@ -360,7 +361,7 @@ public: { #ifdef USING_TRANSACTIONS return (transaction.all.bdb_tid != 0 || - transaction.all.innobase_tid != 0 || + transaction.all.innodb_active_trans != 0 || transaction.all.gemini_tid != 0); #else return 0; |