From eea6e15d11a027698de4f5c9b8c955df5d0abf54 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 8 Dec 2005 16:13:53 +0100 Subject: [PATCH 1/2] 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 --- mysql-test/t/symlink.test | 2 ++ 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 85ad04aa556..c0c1db3d553 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 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; From ff410f95f56963171cc903d9ff906579f0716ef7 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 11 Dec 2005 09:21:13 +0100 Subject: [PATCH 2/2] make_win_src_distribution.sh: Removed Visual Studio 6 project files, as they are not maintained scripts/make_win_src_distribution.sh: Removed Visual Studio 6 project files, as they are not maintained --- scripts/make_win_src_distribution.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh index 2e93ebcb007..2e312e0c3cf 100644 --- a/scripts/make_win_src_distribution.sh +++ b/scripts/make_win_src_distribution.sh @@ -199,7 +199,7 @@ copy_dir_files() print_debug "Creating directory '$arg'" mkdir $BASE/$arg fi - for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def *.hpp *.dsp *.dsw \ + for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def *.hpp \ README INSTALL* LICENSE AUTHORS NEWS ChangeLog \ *.inc *.test *.result *.pem Moscow_leap des_key_file \ *.vcproj *.sln *.dat *.000001 *.require *.opt @@ -340,7 +340,7 @@ mv $BASE/sql/sql_yacc.cpp-new $BASE/sql/sql_yacc.cpp # # Search the tree for plain text files and adapt the line end marker # -find $BASE \( -name "*.dsp" -o -name "*.dsw" -o -name "*.cnf" -o -name "*.ini" \ +find $BASE \( -name "*.cnf" -o -name "*.ini" \ -o -name COPYING -o -name ChangeLog -o -name EXCEPTIONS-CLIENT \ -o -name "INSTALL*" -o -name LICENSE -o -name "README*" \ -o -name "*.vcproj" -o -name "*.sln" \) -type f -print \