1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1

Browse Source 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
This commit is contained in:
kent@mysql.com 2005-12-08 16:15:27 +01:00
commit 8fd7e5f922
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/t/symlink.test
View File

@ -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;

4
sql/mysqld.cc
View File

@ -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;