mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
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
This commit is contained in:
@ -3,6 +3,8 @@ disable_query_log;
|
|||||||
show variables like "have_symlink";
|
show variables like "have_symlink";
|
||||||
enable_query_log;
|
enable_query_log;
|
||||||
|
|
||||||
|
--source include/not_windows.inc
|
||||||
|
|
||||||
--disable_warnings
|
--disable_warnings
|
||||||
drop table if exists t1,t2,t7,t8,t9;
|
drop table if exists t1,t2,t7,t8,t9;
|
||||||
drop database if exists mysqltest;
|
drop database if exists mysqltest;
|
||||||
|
@ -5950,7 +5950,7 @@ static void mysql_init_variables(void)
|
|||||||
#else
|
#else
|
||||||
have_openssl=SHOW_OPTION_NO;
|
have_openssl=SHOW_OPTION_NO;
|
||||||
#endif
|
#endif
|
||||||
#if !defined(HAVE_REALPATH) || defined(HAVE_BROKEN_REALPATH)
|
#ifdef HAVE_BROKEN_REALPATH
|
||||||
have_symlink=SHOW_OPTION_NO;
|
have_symlink=SHOW_OPTION_NO;
|
||||||
#else
|
#else
|
||||||
have_symlink=SHOW_OPTION_YES;
|
have_symlink=SHOW_OPTION_YES;
|
||||||
@ -6631,7 +6631,7 @@ static void get_options(int argc,char **argv)
|
|||||||
usage();
|
usage();
|
||||||
exit(0);
|
exit(0);
|
||||||
}
|
}
|
||||||
#if !defined(HAVE_REALPATH) || defined(HAVE_BROKEN_REALPATH)
|
#if defined(HAVE_BROKEN_REALPATH)
|
||||||
my_use_symdir=0;
|
my_use_symdir=0;
|
||||||
my_disable_symlinks=1;
|
my_disable_symlinks=1;
|
||||||
have_symlink=SHOW_OPTION_NO;
|
have_symlink=SHOW_OPTION_NO;
|
||||||
|
Reference in New Issue
Block a user