summaryrefslogtreecommitdiff
path: root/sql/ha_myisam.h
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-04-06 21:35:26 +0200
committerunknown <serg@serg.mylan>2004-04-06 21:35:26 +0200
commitc62705434021f8ed7b7cfdf9dbba5b1751ebd6f2 (patch)
tree49936e67024c8911d22de045aa8314e5f88d506b /sql/ha_myisam.h
parentf463848913ab86ec9d87cb24dd77d8c17a0e1deb (diff)
downloadmariadb-git-c62705434021f8ed7b7cfdf9dbba5b1751ebd6f2.tar.gz
::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
Field::val_str simplification, comment include/my_base.h: typos fixed mysql-test/r/myisam.result: alter table enable/disable keys mysql-test/t/help.test: cleanup mysql-test/t/myisam.test: alter table enable/disable keys sql/field.cc: Field::val_str() simplification sql/field.h: Field::val_str() simplification and comment sql/field_conv.cc: Field::val_str() simplification sql/ha_berkeley.cc: ::reset(), HA_FAST_KEY_READ sql/ha_berkeley.h: ::reset(), HA_FAST_KEY_READ sql/ha_heap.cc: ::reset(), HA_FAST_KEY_READ sql/ha_heap.h: ::reset(), HA_FAST_KEY_READ sql/ha_innodb.cc: ::reset(), HA_FAST_KEY_READ sql/ha_innodb.h: ::reset(), HA_FAST_KEY_READ sql/ha_isam.cc: ::reset(), HA_FAST_KEY_READ sql/ha_isam.h: ::reset(), HA_FAST_KEY_READ sql/ha_isammrg.cc: ::reset(), HA_FAST_KEY_READ sql/ha_isammrg.h: ::reset(), HA_FAST_KEY_READ sql/ha_myisam.cc: ::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert() sql/ha_myisam.h: ::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert() sql/ha_myisammrg.cc: ::reset(), HA_FAST_KEY_READ sql/ha_myisammrg.h: ::reset(), HA_FAST_KEY_READ sql/handler.h: ::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert() sql/item.cc: Field::val_str() simplification sql/item_sum.cc: Field::val_str() simplification sql/key.cc: Field::val_str() simplification sql/opt_range.cc: Field::val_str() simplification sql/protocol.cc: Field::val_str() simplification sql/records.cc: HA_FAST_KEY_READ sql/sql_acl.cc: Field::val_str() simplification sql/sql_base.cc: ::reset sql/sql_insert.cc: ::reset(), start_bulk_insert(), end_bulk_insert() sql/sql_load.cc: start_bulk_insert(), end_bulk_insert() sql/sql_show.cc: Field::val_str() simplification sql/sql_table.cc: disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert() sql/table.cc: Field::val_str() simplification
Diffstat (limited to 'sql/ha_myisam.h')
-rw-r--r--sql/ha_myisam.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/sql/ha_myisam.h b/sql/ha_myisam.h
index 4d66639690d..ca318b02778 100644
--- a/sql/ha_myisam.h
+++ b/sql/ha_myisam.h
@@ -39,7 +39,7 @@ class ha_myisam: public handler
MI_INFO *file;
ulong int_table_flags;
char *data_file_name, *index_file_name;
- bool enable_activate_all_index;
+ bool can_enable_indexes;
int repair(THD *thd, MI_CHECK &param, bool optimize);
public:
@@ -48,7 +48,7 @@ class ha_myisam: public handler
HA_NULL_KEY | HA_CAN_FULLTEXT | HA_CAN_SQL_HANDLER |
HA_DUPP_POS | HA_BLOB_KEY | HA_AUTO_PART_KEY |
HA_FILE_BASED | HA_HAS_GEOMETRY),
- enable_activate_all_index(1)
+ can_enable_indexes(1)
{}
~ha_myisam() {}
const char *table_type() const { return "MyISAM"; }
@@ -103,11 +103,12 @@ class ha_myisam: public handler
void info(uint);
int extra(enum ha_extra_function operation);
int extra_opt(enum ha_extra_function operation, ulong cache_size);
- int reset(void);
int external_lock(THD *thd, int lock_type);
int delete_all_rows(void);
- void deactivate_non_unique_index(ha_rows rows);
- bool activate_all_index(THD *thd);
+ int disable_indexes(bool all, bool save);
+ int enable_indexes();
+ void start_bulk_insert(ha_rows rows);
+ int end_bulk_insert();
ha_rows records_in_range(int inx,
const byte *start_key,uint start_key_len,
enum ha_rkey_function start_search_flag,