diff options
| author | unknown <bar@gw.udmsearch.izhnet.ru> | 2002-04-18 14:08:38 +0500 |
|---|---|---|
| committer | unknown <bar@gw.udmsearch.izhnet.ru> | 2002-04-18 14:08:38 +0500 |
| commit | c7e72e8d55067b2638a7e8ee6561b0b42008d6de (patch) | |
| tree | 11fdfff134159062911c8a5fb39893fc452771bb /sql/ha_myisam.cc | |
| parent | e8b6c9646eb44a3fd000a7e7996f8e6bf4de7da6 (diff) | |
| download | mariadb-git-c7e72e8d55067b2638a7e8ee6561b0b42008d6de.tar.gz | |
Fix to use Monty's changes in frm format
Enable latin1 by default
configure.in:
Always compile latin1
sql/ha_myisam.cc:
Fix for "SHOW KEYS FROM table" and various key types
sql/sql_show.cc:
Fix to use Monty's changes in frm format
sql/sql_table.cc:
Fix to use Monty's changes in frm format
sql/structs.h:
Fix to use Monty's changes in frm format
sql/table.cc:
Fix to use Monty's changes in frm format
Diffstat (limited to 'sql/ha_myisam.cc')
| -rw-r--r-- | sql/ha_myisam.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc index df4de96b6c5..eabf9536fd0 100644 --- a/sql/ha_myisam.cc +++ b/sql/ha_myisam.cc @@ -124,8 +124,12 @@ const char **ha_myisam::bas_ext() const const char *ha_myisam::index_type(uint key_number) { - return ((table->key_info[key_number].flags & HA_FULLTEXT) ? + return ((table->key_info[key_number].flags & HA_FULLTEXT) ? "FULLTEXT" : + (table->key_info[key_number].flags & HA_SPATIAL) ? + "SPATIAL" : + (table->key_info[key_number].algorithm == HA_KEY_ALG_RTREE) ? + "RTREE" : "BTREE"); } @@ -1006,7 +1010,7 @@ int ha_myisam::create(const char *name, register TABLE *table, for (i=0; i < table->keys ; i++, pos++) { keydef[i].flag= (pos->flags & (HA_NOSAME | HA_FULLTEXT | HA_SPATIAL)); - keydef[i].key_alg=pos->key_alg; // +BAR + keydef[i].key_alg=pos->algorithm; keydef[i].seg=keyseg; keydef[i].keysegs=pos->key_parts; for (j=0 ; j < pos->key_parts ; j++) |