summaryrefslogtreecommitdiff
path: root/sql/partition_info.cc
diff options
context:
space:
mode:
authorholyfoot/hf@hfmain.(none) <>2007-04-04 14:05:45 +0500
committerholyfoot/hf@hfmain.(none) <>2007-04-04 14:05:45 +0500
commitd7352bdd3e0fb3230aae2760f9272fe518c0ad30 (patch)
tree040ebdbeea194ee48cc34b88dd92e4e8a9d1c422 /sql/partition_info.cc
parentf65b42dc6e9e80fe9fe6c7f7ce4ef591a80544ec (diff)
parent497ff2fa9ca2b601a84982a8ddb11c7f7b9e3567 (diff)
downloadmariadb-git-d7352bdd3e0fb3230aae2760f9272fe518c0ad30.tar.gz
Merge mysql.com:/home/hf/work/24633/my51-24633
into mysql.com:/home/hf/work/my_mrg/my51-my_mrg
Diffstat (limited to 'sql/partition_info.cc')
-rw-r--r--sql/partition_info.cc2
1 files changed, 2 insertions, 0 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,