diff options
| author | brian@zim.(none) <> | 2006-09-29 17:19:02 -0700 |
|---|---|---|
| committer | brian@zim.(none) <> | 2006-09-29 17:19:02 -0700 |
| commit | a756fd36ef7f462a0103ad4b5a27f2e1c2924a93 (patch) | |
| tree | 86822c6e236ae413ea0e3e59826a816c678a4fa9 /storage/csv | |
| parent | 4bce203fdf336ada7ba53024e1ac6664a770edf6 (diff) | |
| download | mariadb-git-a756fd36ef7f462a0103ad4b5a27f2e1c2924a93.tar.gz | |
This removes the passing of global hton to engine instance.
Diffstat (limited to 'storage/csv')
| -rw-r--r-- | storage/csv/ha_tina.cc | 14 | ||||
| -rw-r--r-- | storage/csv/ha_tina.h | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc index 8007ebfecd1..3cdfc04f2ce 100644 --- a/storage/csv/ha_tina.cc +++ b/storage/csv/ha_tina.cc @@ -74,7 +74,9 @@ static int write_meta_file(File meta_file, ha_rows rows, bool dirty); pthread_mutex_t tina_mutex; static HASH tina_open_tables; static int tina_init= 0; -static handler *tina_create_handler(TABLE_SHARE *table, MEM_ROOT *mem_root); +static handler *tina_create_handler(handlerton *hton, + TABLE_SHARE *table, + MEM_ROOT *mem_root); off_t Transparent_file::read_next() { @@ -493,14 +495,16 @@ off_t find_eoln_buff(Transparent_file *data_buff, off_t begin, } -static handler *tina_create_handler(TABLE_SHARE *table, MEM_ROOT *mem_root) +static handler *tina_create_handler(handlerton *hton, + TABLE_SHARE *table, + MEM_ROOT *mem_root) { - return new (mem_root) ha_tina(table); + return new (mem_root) ha_tina(hton, table); } -ha_tina::ha_tina(TABLE_SHARE *table_arg) - :handler(tina_hton, table_arg), +ha_tina::ha_tina(handlerton *hton, TABLE_SHARE *table_arg) + :handler(hton, table_arg), /* These definitions are found in handler.h They are not probably completely right. diff --git a/storage/csv/ha_tina.h b/storage/csv/ha_tina.h index 14ca848c855..d9537c42259 100644 --- a/storage/csv/ha_tina.h +++ b/storage/csv/ha_tina.h @@ -129,7 +129,7 @@ private: int init_tina_writer(); public: - ha_tina(TABLE_SHARE *table_arg); + ha_tina(handlerton *hton, TABLE_SHARE *table_arg); ~ha_tina() { if (chain_alloced) |