diff options
| author | unknown <kent@mysql.com> | 2005-12-08 16:13:53 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-12-08 16:13:53 +0100 |
| commit | eea6e15d11a027698de4f5c9b8c955df5d0abf54 (patch) | |
| tree | d58d904a5cd3d8856fcd677b7a7ec1f2ba1ccb22 | |
| parent | 966ab524a336bb22088d4adbb7db7a090762551e (diff) | |
| download | mariadb-git-eea6e15d11a027698de4f5c9b8c955df5d0abf54.tar.gz | |
mysqld.cc:
Bug#14960, reverted code to make symdir work on Windows
symlink.test:
Disabled test case on Windows
mysql-test/t/symlink.test:
Disabled test case on Windows
sql/mysqld.cc:
Bug#14960, reverted code to make symdir work on Windows
| -rw-r--r-- | mysql-test/t/symlink.test | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/t/symlink.test b/mysql-test/t/symlink.test index 85ad04aa556..c0c1db3d553 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 a38763ac9a8..cc9bec35242 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5950,7 +5950,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; @@ -6631,7 +6631,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; |