diff options
| author | unknown <jimw@mysql.com> | 2005-05-07 08:25:58 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-05-07 08:25:58 -0700 |
| commit | 474a4d5d8d997f7cc068a8d1b4a14138e3bc55af (patch) | |
| tree | 0a1534765795d08014f77b4124d29d383bf130ed /sql/ha_heap.cc | |
| parent | de275d94d2b69048e973986e3df3dad8beb6f332 (diff) | |
| parent | 29fcd4b318cccf96fbdd68232c9b0596ead04f9d (diff) | |
| download | mariadb-git-474a4d5d8d997f7cc068a8d1b4a14138e3bc55af.tar.gz | |
Merge
BUILD/FINISH.sh:
Auto merged
client/mysql.cc:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/type_float.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
sql/ha_heap.cc:
Auto merged
mysql-test/r/create.result:
Merge changes
mysql-test/r/temp_table.result:
SCCS merged
mysql-test/t/temp_table.test:
Merge new tests
sql/item.cc:
Merge from 4.1
sql/sql_select.cc:
Merge from 4.1
Diffstat (limited to 'sql/ha_heap.cc')
| -rw-r--r-- | sql/ha_heap.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/ha_heap.cc b/sql/ha_heap.cc index 52ff776c5d6..e3212b095cf 100644 --- a/sql/ha_heap.cc +++ b/sql/ha_heap.cc @@ -424,7 +424,8 @@ THR_LOCK_DATA **ha_heap::store_lock(THD *thd, int ha_heap::delete_table(const char *name) { char buff[FN_REFLEN]; - int error= heap_delete_table(fn_format(buff,name,"","",4+2)); + int error= heap_delete_table(fn_format(buff,name,"","", + MY_REPLACE_EXT|MY_UNPACK_FILENAME)); return error == ENOENT ? 0 : error; } @@ -555,7 +556,8 @@ int ha_heap::create(const char *name, TABLE *table_arg, hp_create_info.max_table_size=current_thd->variables.max_heap_table_size; hp_create_info.with_auto_increment= found_real_auto_increment; max_rows = (ha_rows) (hp_create_info.max_table_size / mem_per_row); - error= heap_create(fn_format(buff,name,"","",4+2), + error= heap_create(fn_format(buff,name,"","", + MY_REPLACE_EXT|MY_UNPACK_FILENAME), keys, keydef, share->reclength, (ulong) ((share->max_rows < max_rows && share->max_rows) ? |