diff options
| author | unknown <serg@serg.mysql.com> | 2001-10-10 18:22:14 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2001-10-10 18:22:14 +0200 |
| commit | 0735a6390aae24db01ddf3d296c4aa490cf4bfce (patch) | |
| tree | e653ab85c004942486ac67e01503e235b0a37894 /sql/handler.h | |
| parent | ca3b162a2f0702a2d8835a30f15fe03699ecea5d (diff) | |
| parent | ab757a5690f79d6f5bab2205085264918c625175 (diff) | |
| download | mariadb-git-0735a6390aae24db01ddf3d296c4aa490cf4bfce.tar.gz | |
Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
include/my_global.h:
Auto merged
sql/handler.h:
Auto merged
sql/lex.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/sql/handler.h b/sql/handler.h index 72e4f292871..2f54dafe82c 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -27,7 +27,7 @@ #define NO_HASH /* Not yet implemented */ #endif -#if defined(HAVE_BERKELEY_DB) || defined(HAVE_INNOBASE_DB) || defined(HAVE_GEMINI_DB) +#if defined(HAVE_BERKELEY_DB) || defined(HAVE_INNOBASE_DB) #define USING_TRANSACTIONS #endif @@ -134,7 +134,6 @@ enum row_type { ROW_TYPE_NOT_USED=-1, ROW_TYPE_DEFAULT, ROW_TYPE_FIXED, typedef struct st_thd_trans { void *bdb_tid; void *innobase_tid; - void *gemini_tid; bool innodb_active_trans; } THD_TRANS; @@ -325,17 +324,6 @@ public: enum thr_lock_type lock_type)=0; }; -#ifdef HAVE_GEMINI_DB -struct st_gemini -{ - void *context; - unsigned long savepoint; - bool needSavepoint; - uint tx_isolation; - uint lock_count; -}; -#endif - /* Some extern variables used with handlers */ extern const char *ha_row_type[]; @@ -366,5 +354,4 @@ int ha_rollback_trans(THD *thd, THD_TRANS *trans); int ha_autocommit_or_rollback(THD *thd, int error); void ha_set_spin_retries(uint retries); bool ha_flush_logs(void); -int ha_commit_rename(THD *thd); int ha_recovery_logging(THD *thd, bool on); |