diff options
| author | mikael@dator6.(none) <> | 2008-02-13 11:29:50 +0100 |
|---|---|---|
| committer | mikael@dator6.(none) <> | 2008-02-13 11:29:50 +0100 |
| commit | e1820b2e779b79b1d9551cab394b795d72b19db1 (patch) | |
| tree | b004486d5ec223d770c06e2be58f8e5c0c1dba36 /sql/sql_table.cc | |
| parent | 2bff6fd22a57db9882e2caedd92f34e9657d3223 (diff) | |
| parent | 6995b41ba2cc48e824c57d91237f99027fe9e0d8 (diff) | |
| download | mariadb-git-e1820b2e779b79b1d9551cab394b795d72b19db1.tar.gz | |
Merge dator6.(none):/home/mikael/mysql_clones/bug32943
into dator6.(none):/home/mikael/mysql_clones/mysql-5.1-engines
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index a0464d43372..553ce9b3f1a 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -3484,8 +3484,18 @@ bool mysql_create_table_no_lock(THD *thd, thd_proc_info(thd, "creating table"); create_info->table_existed= 0; // Mark that table is created - if (thd->variables.sql_mode & MODE_NO_DIR_IN_CREATE) +#ifdef HAVE_READLINK + if (!my_use_symdir || (thd->variables.sql_mode & MODE_NO_DIR_IN_CREATE)) +#endif + { + if (create_info->data_file_name) + push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0, + "DATA DIRECTORY option ignored"); + if (create_info->index_file_name) + push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0, + "INDEX DIRECTORY option ignored"); create_info->data_file_name= create_info->index_file_name= 0; + } create_info->table_options=db_options; path[path_length - reg_ext_length]= '\0'; // Remove .frm extension |