mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new mysql-test/t/symlink.test: Auto merged scripts/make_win_src_distribution.sh: Auto merged sql/mysqld.cc: Auto merged
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;
|
||||||
|
@@ -199,7 +199,7 @@ copy_dir_files()
|
|||||||
print_debug "Creating directory '$arg'"
|
print_debug "Creating directory '$arg'"
|
||||||
mkdir $BASE/$arg
|
mkdir $BASE/$arg
|
||||||
fi
|
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 \
|
README INSTALL* LICENSE AUTHORS NEWS ChangeLog \
|
||||||
*.inc *.test *.result *.pem Moscow_leap des_key_file \
|
*.inc *.test *.result *.pem Moscow_leap des_key_file \
|
||||||
*.vcproj *.sln *.dat *.000001 *.require *.opt
|
*.vcproj *.sln *.dat *.000001 *.require *.opt
|
||||||
@@ -342,7 +342,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
|
# 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 COPYING -o -name ChangeLog -o -name EXCEPTIONS-CLIENT \
|
||||||
-o -name "INSTALL*" -o -name LICENSE -o -name "README*" \
|
-o -name "INSTALL*" -o -name LICENSE -o -name "README*" \
|
||||||
-o -name "*.vcproj" -o -name "*.sln" \) -type f -print \
|
-o -name "*.vcproj" -o -name "*.sln" \) -type f -print \
|
||||||
|
@@ -6469,7 +6469,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;
|
||||||
@@ -7165,7 +7165,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