diff options
| -rwxr-xr-x | Build-tools/Do-win-build | 11 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/Build-tools/Do-win-build b/Build-tools/Do-win-build index b446ba6f601..0885507588c 100755 --- a/Build-tools/Do-win-build +++ b/Build-tools/Do-win-build @@ -22,6 +22,7 @@ if (!$opt_builddir) { $opt_tarball =~ /(mysql[^\/]*)-win-src\.tar/; $mysqlver=$1; $basedir = "$opt_builddir/$mysqlver"; +$scriptdir = `pwd`; # Make sure build dir exists mkdir($opt_builddir); @@ -47,6 +48,8 @@ chdir($mysqlver); system("\"$MSDEV\" mysql.dsw /MAKE \"ALL\" /OUT $mysqlver-build.log"); +system("cp $mysqlver-build.log $scriptdir"); + # # Print a help text message # @@ -55,10 +58,10 @@ sub print_help print <<EOF; Usage: Do-compile-win [options] source-tarball -Unpacks a Windows source distribution on the local machine and +Unpacks a Windows source distribution on the local machine and compiles it using VC++ 6.0. -This script is intended for Cygwin Perl. You must have a working +This script is intended for Cygwin Perl. You must have a working MSDEV.EXE in your path for compilation. @@ -68,8 +71,8 @@ Options: Print this text. --builddir=<dir> -Set the Cygwin path to build under; the tarball will actually -be moved to <builddir>/mysql-<version>/tarball and extracted under +Set the Cygwin path to build under; the tarball will actually +be moved to <builddir>/mysql-<version>/tarball and extracted under <builddir>/mysql-<version>/build. Default: /cygdrive/c/mysql-win-build diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 607d8af6e50..52d9139887e 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -585,7 +585,7 @@ char* getlogin(void); #if defined(__NETWARE__) -/* default to "root" on NetWare */ +/* Default to value of USER on NetWare, if unset use "UNKNOWN_USER" */ static void read_user_name(char *name) { char *str=getenv("USER"); |