diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-11-25 18:17:28 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-11-25 18:17:28 +0100 |
| commit | 65ca700def99289cc31a7040537f5aa6e12bf485 (patch) | |
| tree | 97b3a07299b626c519da0e80c122b5b79b933914 /storage/csv/ha_tina.h | |
| parent | 2ab57de38d13d927ddff2d51aed4af34e13998f5 (diff) | |
| parent | 6e5bcca7935d3c62f84bb640e5357664a210ee12 (diff) | |
| download | mariadb-git-65ca700def99289cc31a7040537f5aa6e12bf485.tar.gz | |
merge.
checkpoint.
does not compile.
Diffstat (limited to 'storage/csv/ha_tina.h')
| -rw-r--r-- | storage/csv/ha_tina.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/storage/csv/ha_tina.h b/storage/csv/ha_tina.h index 845b50e3869..dc2fc743117 100644 --- a/storage/csv/ha_tina.h +++ b/storage/csv/ha_tina.h @@ -85,6 +85,8 @@ class ha_tina: public handler MEM_ROOT blobroot; private: + int curr_lock_type; + bool get_write_pos(my_off_t *end_pos, tina_set *closest_hole); int open_update_temp_file_if_needed(); int init_tina_writer(); @@ -156,6 +158,8 @@ public: bool check_if_incompatible_data(HA_CREATE_INFO *info, uint table_changes); + int external_lock(THD *thd, int lock_type); + THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to, enum thr_lock_type lock_type); |