diff options
| author | kent@mysql.com <> | 2005-12-08 16:15:27 +0100 |
|---|---|---|
| committer | kent@mysql.com <> | 2005-12-08 16:15:27 +0100 |
| commit | 8fd7e5f922aff0a1ec5b460cadcb80ba8f8c013b (patch) | |
| tree | d04294322645af9a39fa66e12d93a56dd5dce07f | |
| parent | 56faadcc4234bfb85cd5396f9d54ff2b1171a0dd (diff) | |
| parent | e8198e799eb0fb0a5105a87e06ca2c2dcdff993d (diff) | |
| download | mariadb-git-8fd7e5f922aff0a1ec5b460cadcb80ba8f8c013b.tar.gz | |
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
| -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 b7a7e83d569..6a6dd305006 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 8792d2560ae..fd9426cce2c 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; |