diff options
| author | monty@mishka.local <> | 2004-09-09 15:58:55 +0300 |
|---|---|---|
| committer | monty@mishka.local <> | 2004-09-09 15:58:55 +0300 |
| commit | 3ce78a27cdcb9b0ba4d6e0f36f2953cf8db7b518 (patch) | |
| tree | 368687b45835bc7b5a71ef90de23cb752f4a1865 /sql/ha_heap.cc | |
| parent | d27f3d6c8f17006939e53aeb6c678403a7390a0c (diff) | |
| parent | e67fcee270ba58fcde915647b1a647cdd293edd5 (diff) | |
| download | mariadb-git-3ce78a27cdcb9b0ba4d6e0f36f2953cf8db7b518.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mishka.local:/home/my/mysql-5.0
Diffstat (limited to 'sql/ha_heap.cc')
| -rw-r--r-- | sql/ha_heap.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/ha_heap.cc b/sql/ha_heap.cc index cc828b6e6b2..d7327362286 100644 --- a/sql/ha_heap.cc +++ b/sql/ha_heap.cc @@ -360,7 +360,8 @@ THR_LOCK_DATA **ha_heap::store_lock(THD *thd, int ha_heap::delete_table(const char *name) { - int error=heap_delete_table(name); + char buff[FN_REFLEN]; + int error= heap_delete_table(fn_format(buff,name,"","",4+2)); return error == ENOENT ? 0 : error; } @@ -429,7 +430,7 @@ int ha_heap::create(const char *name, TABLE *table_arg, { if (!f_is_packed(flag) && f_packtype(flag) == (int) FIELD_TYPE_DECIMAL && - !(flag & FIELDFLAG_BINARY)) + !(field->charset() == &my_charset_bin)) seg->type= (int) HA_KEYTYPE_TEXT; else seg->type= (int) HA_KEYTYPE_BINARY; |