diff options
| author | unknown <msvensson@pilot.mysql.com> | 2007-01-17 11:13:03 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2007-01-17 11:13:03 +0100 |
| commit | 4743deeba0ec93e27763100bb1f76c7a1239bbcb (patch) | |
| tree | e6e8abe6dc7e1b5c2079535bbfa9cf05d23c8997 /sql/sql_parse.cc | |
| parent | 5f9a8075626db75e770d679eae4ae0dd52e1400e (diff) | |
| parent | 56e9169013682c71e5a42542146540f553907e39 (diff) | |
| download | mariadb-git-4743deeba0ec93e27763100bb1f76c7a1239bbcb.tar.gz | |
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1
into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
mysql-test/t/mysqladmin.test:
Auto merged
mysys/mf_iocache.c:
Auto merged
mysys/my_read.c:
Auto merged
mysys/my_seek.c:
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 19add72c23e..07064113209 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 */ |