diff options
| author | unknown <evgen@moonbone.local> | 2006-06-30 02:03:09 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-06-30 02:03:09 +0400 |
| commit | 3cf92fb7d67b22f33f4846ecf68c3f56c301cc20 (patch) | |
| tree | 6ce5b21a6641825299a323d1ead34db5a94565ba /sql/sql_parse.cc | |
| parent | 6ea7aafc0a8138d0092fbc7e5a4c5ea993157162 (diff) | |
| parent | 52a1639b0eb669363cfa311b5ce24aa83076a426 (diff) | |
| download | mariadb-git-3cf92fb7d67b22f33f4846ecf68c3f56c301cc20.tar.gz | |
Merge
mysql-test/r/func_sapdb.result:
Auto merged
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/func_sapdb.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
mysql-test/r/func_time.result:
SCCS merged
mysql-test/t/func_time.test:
SCCS 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 cd57c280950..7c07b4f8847 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -3057,6 +3057,12 @@ end_with_restore_list: } } /* Don't yet allow changing of symlinks with ALTER TABLE */ + 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; /* ALTER TABLE ends previous transaction */ if (end_active_trans(thd)) |