diff options
| author | kent@mysql.com <> | 2005-12-15 00:43:41 +0100 |
|---|---|---|
| committer | kent@mysql.com <> | 2005-12-15 00:43:41 +0100 |
| commit | 28a59073b06363585f5acda942559850c1e22332 (patch) | |
| tree | 0684e7374b9c50719d0733dbf6b7d666fd4cc049 /sql | |
| parent | 0663f81acd00af4b4c6ff96391f70738f7e9f217 (diff) | |
| parent | cf57f12407a1fdb768ef42df27f103590e317993 (diff) | |
| download | mariadb-git-28a59073b06363585f5acda942559850c1e22332.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
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 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; |