diff options
| author | unknown <ram@gw.udmsearch.izhnet.ru> | 2002-04-25 15:10:29 +0500 |
|---|---|---|
| committer | unknown <ram@gw.udmsearch.izhnet.ru> | 2002-04-25 15:10:29 +0500 |
| commit | 3adee5046d70aa91fead16c289dd2a1b098b3dfd (patch) | |
| tree | fae16eacfad983f202e51e4a4398875f00513543 /sql | |
| parent | 139a73cade4827ca2a41d6cfc9db379b2c696fa3 (diff) | |
| download | mariadb-git-3adee5046d70aa91fead16c289dd2a1b098b3dfd.tar.gz | |
MI_KEYSEG -> HA_KEYSEG
_mi_key_cmp -> ha_key_cmp
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_heap.cc | 6 | ||||
| -rw-r--r-- | sql/ha_myisam.cc | 4 | ||||
| -rw-r--r-- | sql/sql_select.cc | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sql/ha_heap.cc b/sql/ha_heap.cc index 8a4758aa558..1abaa63de68 100644 --- a/sql/ha_heap.cc +++ b/sql/ha_heap.cc @@ -36,7 +36,7 @@ int ha_heap::open(const char *name, int mode, uint test_if_locked) uint key,parts,mem_per_row=0; ulong max_rows; HP_KEYDEF *keydef; - MI_KEYSEG *seg; + HA_KEYSEG *seg; for (key=parts=0 ; key < table->keys ; key++) { @@ -48,9 +48,9 @@ int ha_heap::open(const char *name, int mode, uint test_if_locked) } if (!(keydef=(HP_KEYDEF*) my_malloc(table->keys*sizeof(HP_KEYDEF)+ - parts*sizeof(MI_KEYSEG),MYF(MY_WME)))) + parts*sizeof(HA_KEYSEG),MYF(MY_WME)))) return my_errno; - seg=my_reinterpret_cast(MI_KEYSEG*) (keydef+table->keys); + seg=my_reinterpret_cast(HA_KEYSEG*) (keydef+table->keys); for (key=0 ; key < table->keys ; key++) { KEY *pos=table->key_info+key; diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc index 3def79dc67f..a8bbc03aa91 100644 --- a/sql/ha_myisam.cc +++ b/sql/ha_myisam.cc @@ -993,7 +993,7 @@ int ha_myisam::create(const char *name, register TABLE *table, KEY *pos; MI_KEYDEF *keydef; MI_COLUMNDEF *recinfo,*recinfo_pos; - MI_KEYSEG *keyseg; + HA_KEYSEG *keyseg; uint options=table->db_options_in_use; DBUG_ENTER("ha_myisam::create"); @@ -1002,7 +1002,7 @@ int ha_myisam::create(const char *name, register TABLE *table, &recinfo,(table->fields*2+2)*sizeof(MI_COLUMNDEF), &keydef, table->keys*sizeof(MI_KEYDEF), &keyseg, - ((table->key_parts + table->keys) * sizeof(MI_KEYSEG)), + ((table->key_parts + table->keys) * sizeof(HA_KEYSEG)), 0))) DBUG_RETURN(1); diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 2abefe0aac5..2599fe216c5 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -3942,7 +3942,7 @@ static bool create_myisam_tmp_table(TABLE *table,TMP_TABLE_PARAM *param, if (table->keys) { // Get keys for ni_create bool using_unique_constraint=0; - MI_KEYSEG *seg= (MI_KEYSEG*) sql_calloc(sizeof(*seg) * + HA_KEYSEG *seg= (HA_KEYSEG*) sql_calloc(sizeof(*seg) * keyinfo->key_parts); if (!seg) goto err; |