1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG#21350: Fix correct error handling when using DATA DIRECTORY and INDEX DIRECTORY

Browse Source 
Review fixes
This commit is contained in:
unknown 2006-08-17 09:05:15 -04:00
parent 09a27bb217
commit a5b43381fe
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sql/ha_partition.cc
View File

@ -1752,6 +1752,8 @@ int ha_partition::set_up_table_before_create(TABLE *table,
partition_element *part_elem) partition_element *part_elem)
{ {
int error= 0; int error= 0;
const char *partition_name;
THD *thd= current_thd;
DBUG_ENTER("set_up_table_before_create"); DBUG_ENTER("set_up_table_before_create");
if (!part_elem) if (!part_elem)
@ -1762,17 +1764,16 @@ int ha_partition::set_up_table_before_create(TABLE *table,
} }
table->s->max_rows= part_elem->part_max_rows; table->s->max_rows= part_elem->part_max_rows;
table->s->min_rows= part_elem->part_min_rows; table->s->min_rows= part_elem->part_min_rows;
const char *partition_name= strrchr(partition_name_with_path, FN_LIBCHAR); partition_name= strrchr(partition_name_with_path, FN_LIBCHAR);
if ((part_elem->index_file_name && if ((part_elem->index_file_name &&
(error= append_file_to_dir(current_thd, (error= append_file_to_dir(thd,
(const char**)&part_elem->index_file_name, (const char**)&part_elem->index_file_name,
partition_name+1))) || partition_name+1))) ||
(part_elem->data_file_name && (part_elem->data_file_name &&
(error= append_file_to_dir(current_thd, (error= append_file_to_dir(thd,
(const char**)&part_elem->data_file_name, (const char**)&part_elem->data_file_name,
partition_name+1)))) partition_name+1))))
{ {
DBUG_ASSERT(error);
DBUG_RETURN(error); DBUG_RETURN(error);
} }
info->index_file_name= part_elem->index_file_name; info->index_file_name= part_elem->index_file_name;