diff options
| author | unknown <kent@mysql.com> | 2005-12-14 13:09:41 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-12-14 13:09:41 +0100 |
| commit | d051f628117eea491ae4cae6ad902588adaa8eaf (patch) | |
| tree | 9fe0d92807795809010aab8ad1100c00e437c598 /sql | |
| parent | 97746386af0b660b8840fe0dba41535d18fee62b (diff) | |
| parent | 0a2cef6a84429a72b682787c3131432babe7d270 (diff) | |
| download | mariadb-git-d051f628117eea491ae4cae6ad902588adaa8eaf.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index cd0c2d736c2..aaa467603f5 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; |