Skip to content

M
mariadb
Commit d64142e2 authored by holyfoot/hf@deer.(none)'s avatar holyfoot/hf@deer.(none)
Browse files
Options

Merge bk@192.168.21.1:mysql-5.1-opt 

into  mysql.com:/home/hf/work/22634/my51-22634
parents af74fd07 f8263518
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 3 deletions
storage/archive/ha_archive.cc
View file @ d64142e2
...@@ -458,7 +458,7 @@ ARCHIVE_SHARE *ha_archive::get_share(const char *table_name, ...@@ -458,7 +458,7 @@ ARCHIVE_SHARE *ha_archive::get_share(const char *table_name,
Since we now possibly no real_path, we will use it instead if it exists. Since we now possibly no real_path, we will use it instead if it exists.
*/ */
if (*share->real_path) if (*share->real_path)
fn_format(share->data_file_name, share->real_path, "", ARZ, fn_format(share->data_file_name, table_name, share->real_path, ARZ,
MY_REPLACE_EXT|MY_UNPACK_FILENAME); MY_REPLACE_EXT|MY_UNPACK_FILENAME);
VOID(my_hash_insert(&archive_open_tables, (byte*) share)); VOID(my_hash_insert(&archive_open_tables, (byte*) share));
thr_lock_init(&share->lock); thr_lock_init(&share->lock);
...@@ -686,9 +686,13 @@ int ha_archive::create(const char *name, TABLE *table_arg, ...@@ -686,9 +686,13 @@ int ha_archive::create(const char *name, TABLE *table_arg,
goto error; goto error;
} }
/*
We reuse name_buff since it is available.
*/
write_meta_file(create_file, 0, stats.auto_increment_value, 0, write_meta_file(create_file, 0, stats.auto_increment_value, 0,
(char *)create_info->data_file_name, (create_info->data_file_name &&
FALSE); dirname_part(name_buff, (char*)create_info->data_file_name))
? name_buff : 0, FALSE);
my_close(create_file,MYF(0)); my_close(create_file,MYF(0));
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7