bk commit into 5.0 tree (kent:1.1898)

[kent]

Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1898 05/07/06 16:42:16 kent@stripped +2 -0
  Merge

  VC++Files/tests/mysql_client_test.dsp
    1.6 05/07/06 16:42:11 kent@stripped +4 -8

  mysql-test/mysql-test-run.pl
    1.29 05/07/06 16:31:35 kent@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	g4-2.local
# Root:	/Users/kent/mysql/bk/mysql-5.0-release/RESYNC

--- 1.28/mysql-test/mysql-test-run.pl	2005-07-06 00:24:32 +02:00
+++ 1.29/mysql-test/mysql-test-run.pl	2005-07-06 16:31:35 +02:00
@@ -419,7 +419,8 @@
   {
     # Windows programs like 'mysqld' needs Windows paths
     $glob_mysql_test_dir= `cygpath -m $glob_mysql_test_dir`;
-    $glob_cygwin_shell=   `cygpath -w $ENV{'SHELL'}`; # The Windows path c:\...
+    my $shell= $ENV{'SHELL'} || "/bin/bash";
+    $glob_cygwin_shell=   `cygpath -w $shell`; # The Windows path c:\...
     chomp($glob_mysql_test_dir);
     chomp($glob_cygwin_shell);
   }

--- 1.5/VC++Files/tests/mysql_client_test.dsp	2005-06-09 16:52:42 +02:00
+++ 1.6/VC++Files/tests/mysql_client_test.dsp	2005-07-06 16:42:11 +02:00
@@ -51,8 +51,8 @@
 # ADD BASE BSC32 /nologo 
 # ADD BSC32 /nologo 
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib
..\extra\yassl\Release\yassl.lib /nologo /out:"..\mysql_client_test.exe" /incremental:yes
/libpath:"..\lib_debug\" /debug /pdb:".\Debug\mysql_client_test.pdb" /pdbtype:sept
/map:".\Debug\mysql_client_test.map" /subsystem:console 
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib
odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib
..\extra\yassl\Release\yassl.lib /nologo /out:"..\mysql_client_test.exe" /incremental:yes
/libpath:"..\lib_debug\" /debug /pdb:".\Debug\mysql_client_test.pdb" /pdbtype:sept
/map:".\Debug\mysql_client_test.map" /subsystem:console 
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib
..\extra\yassl\Release\yassl.lib /nologo /out:"..\client_debug\mysql_client_test.exe"
/incremental:yes /libpath:"..\lib_debug\" /debug /pdb:".\Debug\mysql_client_test.pdb"
/pdbtype:sept /map:".\Debug\mysql_client_test.map" /subsystem:console 
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib
odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib
..\extra\yassl\Release\yassl.lib /nologo /out:"..\client_debug\mysql_client_test.exe"
/incremental:yes /libpath:"..\lib_debug\" /debug /pdb:".\Debug\mysql_client_test.pdb"
/pdbtype:sept /map:".\Debug\mysql_client_test.map" /subsystem:console 
 
 !ELSEIF  "$(CFG)" == "mysql_client_test - Win32 Release"
 
@@ -76,8 +76,8 @@
 # ADD BASE BSC32 /nologo 
 # ADD BSC32 /nologo 
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
odbc32.lib odbccp32.lib Ws2_32.lib mysqlclient.lib mysys.lib regex.lib
..\extra\yassl\Release\yassl.lib /nologo /out:"..\mysql_client_test.exe" /incremental:no
/pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console 
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib
odbccp32.lib Ws2_32.lib mysqlclient.lib mysys.lib regex.lib
..\extra\yassl\Release\yassl.lib /nologo /out:"..\mysql_client_test.exe" /incremental:no
/pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console 
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
odbc32.lib odbccp32.lib Ws2_32.lib mysqlclient.lib mysys.lib regex.lib
..\extra\yassl\Release\yassl.lib /nologo /out:"..\client_release\mysql_client_test.exe"
/incremental:no /pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console 
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib
odbccp32.lib Ws2_32.lib mysqlclient.lib mysys.lib regex.lib
..\extra\yassl\Release\yassl.lib /nologo /out:"..\client_release\mysql_client_test.exe"
/incremental:no /pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console 
 
 !ENDIF