diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-04-04 14:05:45 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-04-04 14:05:45 +0500 |
| commit | 0a9e85e04dd88d073147938d02d6bb8895b29b10 (patch) | |
| tree | 040ebdbeea194ee48cc34b88dd92e4e8a9d1c422 /sql | |
| parent | b4fab0eb9447df5615cbe0e2d2f3f778634ce2ba (diff) | |
| parent | 0d6367f6692b66e16f5861d42ee21ebd4128d12d (diff) | |
| download | mariadb-git-0a9e85e04dd88d073147938d02d6bb8895b29b10.tar.gz | |
Merge mysql.com:/home/hf/work/24633/my51-24633
into mysql.com:/home/hf/work/my_mrg/my51-my_mrg
sql/partition_info.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/partition_info.cc | 2 | ||||
| -rw-r--r-- | sql/sql_partition.cc | 15 |
2 files changed, 11 insertions, 6 deletions
diff --git a/sql/partition_info.cc b/sql/partition_info.cc index 98c2e5432ab..e0d2236d804 100644 --- a/sql/partition_info.cc +++ b/sql/partition_info.cc @@ -776,6 +776,8 @@ bool partition_info::check_partition_info(THD *thd, handlerton **eng_type, partition_element *part_elem= part_it++; if (part_elem->engine_type == NULL) part_elem->engine_type= default_engine_type; + if (thd->variables.sql_mode & MODE_NO_DIR_IN_CREATE) + part_elem->data_file_name= part_elem->index_file_name= 0; if (!is_sub_partitioned()) { if (check_table_name(part_elem->partition_name, diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index dbac53ed5f6..0dae41e7bad 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -1892,12 +1892,15 @@ static int add_partition_options(File fptr, partition_element *p_elem) err+= add_keyword_int(fptr,"MAX_ROWS",(longlong)p_elem->part_max_rows); if (p_elem->part_min_rows) err+= add_keyword_int(fptr,"MIN_ROWS",(longlong)p_elem->part_min_rows); - if (p_elem->data_file_name) - err+= add_keyword_string(fptr, "DATA DIRECTORY", TRUE, - p_elem->data_file_name); - if (p_elem->index_file_name) - err+= add_keyword_string(fptr, "INDEX DIRECTORY", TRUE, - p_elem->index_file_name); + if (!(current_thd->variables.sql_mode & MODE_NO_DIR_IN_CREATE)) + { + if (p_elem->data_file_name) + err+= add_keyword_string(fptr, "DATA DIRECTORY", TRUE, + p_elem->data_file_name); + if (p_elem->index_file_name) + err+= add_keyword_string(fptr, "INDEX DIRECTORY", TRUE, + p_elem->index_file_name); + } if (p_elem->part_comment) err+= add_keyword_string(fptr, "COMMENT", TRUE, p_elem->part_comment); return err + add_engine(fptr,p_elem->engine_type); |