summaryrefslogtreecommitdiff
path: root/sql/partition_info.cc
diff options
context:
space:
mode:
authorholyfoot/hf@mysql.com/hfmain.(none) <>2007-03-11 01:17:41 +0400
committerholyfoot/hf@mysql.com/hfmain.(none) <>2007-03-11 01:17:41 +0400
commitce89422b970cded58c36e32f96ff7d8bdde65b7a (patch)
treea6b8e2f842f6df6f0a6e508b59680e645a1ee61d /sql/partition_info.cc
parentbcc5499bab2badf3263c643d0b8e54bad8550746 (diff)
downloadmariadb-git-ce89422b970cded58c36e32f96ff7d8bdde65b7a.tar.gz
Bug #24633 SQL MODE "NO_DIR_IN_CREATE" does not work with
partitioned tables" We have to ignore 'data directory' and 'index directory' parameters if NO_DIR_IN_CREATE set.
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 a7f9bd413c6..d1a5edc2ac6 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,