summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <Kristofer.Pettersson@naruto.>2006-12-11 13:06:59 +0100
committerunknown <Kristofer.Pettersson@naruto.>2006-12-11 13:06:59 +0100
commite78b4fc276f2d5caf8633d0906ebbc492f70ef8a (patch)
treec55b0af49d530c3a332cd0a8a92e5c86ddf90fa4 /sql
parentb8151c7e44ea680f4795c7cff93d2302308bbac6 (diff)
parent1267a7fb3c589ab8417e71d32036a1b2410c5c03 (diff)
downloadmariadb-git-e78b4fc276f2d5caf8633d0906ebbc492f70ef8a.tar.gz
Merge naruto.:C:/cpp/bug17489/my41-bug17489
into naruto.:C:/cpp/mysql-4.1-maint
Diffstat (limited to 'sql')
-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 */