Merge naruto.:C:/cpp/bug17489/my50-bug17489

into  naruto.:C:/cpp/bug17489/my51-bug17489

mysql-test/t/windows.test

@@ -17,6 +17,15 @@ use prn;
 create table nu (a int);
 drop table nu;
 
+#
+# Bug17489: ailed to put data file in custom directory use "data directory" option
+#
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+CREATE TABLE t1 ( `ID` int(6) ) data directory 'c:/tmp/' index directory 'c:/tmp/' engine=MyISAM;
+drop table t1;
+
 # End of 4.1 tests
 
 #

sql/sql_parse.cc

@@ -2955,6 +2955,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 */