diff options
| author | unknown <Kristofer.Pettersson@naruto.> | 2006-12-10 16:40:15 +0100 |
|---|---|---|
| committer | unknown <Kristofer.Pettersson@naruto.> | 2006-12-10 16:40:15 +0100 |
| commit | c35c8a17d29c86cfed92f0b6d95125bb81eb6ed2 (patch) | |
| tree | 4cc838abacde41e317695c9e520803ab7812e358 /sql/sql_parse.cc | |
| parent | 429cf988074f4c1433fcf1930a7a8377e8972ae3 (diff) | |
| parent | 1267a7fb3c589ab8417e71d32036a1b2410c5c03 (diff) | |
| download | mariadb-git-c35c8a17d29c86cfed92f0b6d95125bb81eb6ed2.tar.gz | |
Merge naruto.:C:/cpp/bug17489/my41-bug17489
into naruto.:C:/cpp/bug17489/my50-bug17489
mysql-test/r/windows.result:
Auto merged
mysql-test/t/windows.test:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 6 |
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 */ |