diff options
| author | brian@zim.tangent.org <> | 2006-02-08 21:55:40 -0800 |
|---|---|---|
| committer | brian@zim.tangent.org <> | 2006-02-08 21:55:40 -0800 |
| commit | 01a8c5440664c264ddf8bff8bd46b1128cc4c7a1 (patch) | |
| tree | ec4b4c913e2e615081a9367361715eae089dcd71 /storage | |
| parent | 51fda104cca335b9a42d7cd4773741e6410b105b (diff) | |
| parent | 23d99ee03c8e360dade0d6063b5e938fa5c2e196 (diff) | |
| download | mariadb-git-01a8c5440664c264ddf8bff8bd46b1128cc4c7a1.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into zim.tangent.org:/home/brian/mysql/cleanup-5.1
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/csv/ha_tina.cc | 10 | ||||
| -rw-r--r-- | storage/csv/ha_tina.h | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc index 17c842f43e0..bc228d5c767 100644 --- a/storage/csv/ha_tina.cc +++ b/storage/csv/ha_tina.cc @@ -92,7 +92,9 @@ handlerton tina_hton= { NULL, /* Alter table flags */ NULL, /* Alter Tablespace */ NULL, /* Fill FILES Table */ - HTON_CAN_RECREATE + HTON_CAN_RECREATE, + NULL, /* binlog_func */ + NULL /* binlog_log_query */ }; /***************************************************************************** @@ -1018,6 +1020,12 @@ int ha_tina::create(const char *name, TABLE *table_arg, DBUG_RETURN(0); } +bool ha_tina::check_if_incompatible_data(HA_CREATE_INFO *info, + uint table_changes) +{ + return COMPATIBLE_DATA_YES; +} + mysql_declare_plugin { MYSQL_STORAGE_ENGINE_PLUGIN, diff --git a/storage/csv/ha_tina.h b/storage/csv/ha_tina.h index a11d4281389..572d05cb779 100644 --- a/storage/csv/ha_tina.h +++ b/storage/csv/ha_tina.h @@ -122,6 +122,8 @@ public: int extra(enum ha_extra_function operation); int delete_all_rows(void); int create(const char *name, TABLE *form, HA_CREATE_INFO *create_info); + bool check_if_incompatible_data(HA_CREATE_INFO *info, + uint table_changes); THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to, enum thr_lock_type lock_type); |