summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
diff options
context:
space:
mode:
authorKristofer.Pettersson@naruto. <>2006-12-07 17:01:00 +0100
committerKristofer.Pettersson@naruto. <>2006-12-07 17:01:00 +0100
commitecbb4eb987c50060e8f33be9857de35168035d65 (patch)
tree996755384c967621def827a5254ddb86c448ab21 /sql/sql_parse.cc
parentbe212d34863ffdd0ab5dba1f633f69a9df0510ef (diff)
downloadmariadb-git-ecbb4eb987c50060e8f33be9857de35168035d65.tar.gz
Bug#17498 failed to put data file in custom directory use "data directory" option
- Using DATA/INDEX DIRECTORY option on Windows put data/index file into default directory because the OS doesn't support readlink(). - The procedure for changing data/index file directory is different under Windows. - With this fix we report a warning if DATA/INDEX option is used, but OS doesn't support readlink().
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r--sql/sql_parse.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index cb2fa0f7014..9f443fae215 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -2485,6 +2485,12 @@ mysql_execute_command(THD *thd)
goto unsent_create_error;
#ifndef HAVE_READLINK
+ if (lex->create_info.data_file_name)
+ push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0,
+ "DATA DIRECTORY option ignored");
+ if (lex->create_info.index_file_name)
+ push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0,
+ "INDEX DIRECTORY option ignored");
lex->create_info.data_file_name=lex->create_info.index_file_name=0;
#else
/* Fix names if symlinked tables */