summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
diff options
context:
space:
mode:
authorKristofer.Pettersson@naruto. <>2006-12-10 16:40:15 +0100
committerKristofer.Pettersson@naruto. <>2006-12-10 16:40:15 +0100
commit57abd1dc1e6fb4d59a42ba8f694763759b43d954 (patch)
tree4cc838abacde41e317695c9e520803ab7812e358 /sql/sql_parse.cc
parent244ec63ac42d6a5674fb152e395fa21a598ef4f5 (diff)
parentecbb4eb987c50060e8f33be9857de35168035d65 (diff)
downloadmariadb-git-57abd1dc1e6fb4d59a42ba8f694763759b43d954.tar.gz
Merge naruto.:C:/cpp/bug17489/my41-bug17489
into naruto.:C:/cpp/bug17489/my50-bug17489
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 65257c06d69..18922d27747 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -2900,6 +2900,12 @@ mysql_execute_command(THD *thd)
goto end_with_restore_list;
#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 */