diff --git a/mysql-test/r/windows.result b/mysql-test/r/windows.result
index e8c3c81a44e..7472b724f47 100644
--- a/mysql-test/r/windows.result
+++ b/mysql-test/r/windows.result
@@ -6,6 +6,12 @@ use prn;
 ERROR 42000: Unknown database 'prn'
 create table nu (a int);
 drop table nu;
+drop table if exists t1;
+CREATE TABLE t1 ( `ID` int(6) ) data directory 'c:/tmp/' index directory 'c:/tmp/' engine=MyISAM;
+Warnings:
+Warning	0	DATA DIRECTORY option ignored
+Warning	0	INDEX DIRECTORY option ignored
+drop table t1;
 create procedure proc_1() install plugin my_plug soname '\\root\\some_plugin.dll';
 call proc_1();
 ERROR HY000: No paths allowed for shared library
diff --git a/mysql-test/t/windows.test b/mysql-test/t/windows.test
index 4dab646df2c..a10d54b5452 100644
--- a/mysql-test/t/windows.test
+++ b/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
 
 #
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 1c46c3189d9..573f8ad649e 100644
--- a/sql/sql_parse.cc
+++ b/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 */