Merge bk@192.168.21.1:mysql-5.1-opt
into mysql.com:/home/hf/work/22634/my51-22634 storage/archive/ha_archive.cc: Auto merged
This commit is contained in:
commit
6b455c442d
@ -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,
|
|||||||
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));
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user