diff --git a/mysql-test/t/symlink.test b/mysql-test/t/symlink.test index b7a7e83d569b94d70c9dec0c1fef059859a93aa1..6a6dd305006aef01fbebbe3519243534a922844b 100644 --- a/mysql-test/t/symlink.test +++ b/mysql-test/t/symlink.test @@ -3,6 +3,8 @@ disable_query_log; show variables like "have_symlink"; enable_query_log; +--source include/not_windows.inc + --disable_warnings drop table if exists t1,t2,t7,t8,t9; drop database if exists mysqltest; diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 8792d2560aefe714e36daf4fa1c0fc454681e6d8..fd9426cce2ca6f1db65a9deb81a84a3b48e018c5 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -6358,7 +6358,7 @@ static void mysql_init_variables(void) #else have_openssl=SHOW_OPTION_NO; #endif -#if !defined(HAVE_REALPATH) || defined(HAVE_BROKEN_REALPATH) +#ifdef HAVE_BROKEN_REALPATH have_symlink=SHOW_OPTION_NO; #else have_symlink=SHOW_OPTION_YES; @@ -7053,7 +7053,7 @@ static void get_options(int argc,char **argv) usage(); exit(0); } -#if !defined(HAVE_REALPATH) || defined(HAVE_BROKEN_REALPATH) +#if defined(HAVE_BROKEN_REALPATH) my_use_symdir=0; my_disable_symlinks=1; have_symlink=SHOW_OPTION_NO;