Merge

VC++Files/mysql.dsw:
  Auto merged
mysql-test/my_create_tables.c:
  Auto merged
mysql-test/my_manage.c:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged

2 files changed, 130 insertions, 20 deletions

diff --git a/VC++Files/mysql.dsw b/VC++Files/mysql.dsw
index b0a36f1bd24..43cfab4b915 100644
--- a/VC++Files/mysql.dsw
+++ b/VC++Files/mysql.dsw
@@ -735,15 +735,15 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mysqltest"=.\client\mysqltest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
+Project: "mysqltest"=.\client\mysqltest.dsp - Package Owner=<4>

+

+Package=<5>

+{{{
+
}}}
+

+

+Package=<4>

+{{{
    Begin Project Dependency
     Project_Dep_Name libmysql
     End Project Dependency
     Begin Project Dependency
@@ -754,24 +754,40 @@ Package=<4>
     End Project Dependency
 }}}
 
-###############################################################################
-
-Project: "mysql_test_run_new"=".\mysql-test\mysql_test_run_new.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
+###############################################################################

+

+Project: "mysql_client_test"=.\tests\mysql_client_test.dsp - Package Owner=<4>
+

+


Package=<5>

+{{{

+
}}}
+

+



Package=<4>
+

{{{
+
}}}
+
+


###############################################################################
+
+

+Project: "mysql_test_run_new"=".\mysql-test\mysql_test_run_new.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{
    Begin Project Dependency
     Project_Dep_Name mysqltest
     End Project Dependency
     Begin Project Dependency
     Project_Dep_Name mysqladmin
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mysql_client_test
+    End Project Dependency
 }}}
 
+
 ###############################################################################
 
 Global:
diff --git a/VC++Files/tests/mysql_client_test.dsp b/VC++Files/tests/mysql_client_test.dsp
new file mode 100644
index 00000000000..07014487bd1
--- /dev/null
+++ b/VC++Files/tests/mysql_client_test.dsp
@@ -0,0 +1,94 @@
+# Microsoft Developer Studio Project File - Name="mysql_client_test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=mysql_client_test - Win32 Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "mysql_client_test.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "mysql_client_test.mak" CFG="mysql_client_test - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "mysql_client_test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "mysql_client_test - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+MTL=midl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "mysql_client_test - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Debug"

+# PROP BASE Intermediate_Dir ".\Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\Debug"

+# PROP Intermediate_Dir ".\Debug"

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MTd /I "../include" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /Fp".\Debug/mysql_client_test.pch" /Fo".\Debug/" /Fd".\Debug/" /GZ /c /GX 

+# ADD CPP /nologo /MTd /I "../include" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /Fp".\Debug/mysql_client_test.pch" /Fo".\Debug/" /Fd".\Debug/" /GZ /c /GX 

+# ADD BASE MTL /nologo /tlb".\Debug\mysql_client_test.tlb" /win32 

+# ADD MTL /nologo /tlb".\Debug\mysql_client_test.tlb" /win32 

+# ADD BASE RSC /l 1033 

+# ADD RSC /l 1033 

+BSC32=bscmake.exe

+# 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 /nologo /out:"..\tests\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 /nologo /out:"..\tests\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"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Release"

+# PROP BASE Intermediate_Dir ".\Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\Release"

+# PROP Intermediate_Dir ".\Release"

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MTd /I "../include" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /GF /Gy /Fp".\Release/client_test.pch" /Fo".\Release/" /Fd".\Release/" /c /GX 

+# ADD CPP /nologo /MTd /I "../include" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /GF /Gy /Fp".\Release/client_test.pch" /Fo".\Release/" /Fd".\Release/" /c /GX 

+# ADD BASE MTL /nologo /tlb".\Release\client_test.tlb" /win32 

+# ADD MTL /nologo /tlb".\Release\client_test.tlb" /win32 

+# ADD BASE RSC /l 1033 

+# ADD RSC /l 1033 

+BSC32=bscmake.exe

+# 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 /nologo /out:"..\tests\client_test.exe" /incremental:no /pdb:".\Release\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 /nologo /out:"..\tests\client_test.exe" /incremental:no /pdb:".\Release\client_test.pdb" /pdbtype:sept /subsystem:console 

+

+!ENDIF

+

+# Begin Target

+

+# Name "mysql_client_test - Win32 Debug"

+# Name "mysql_client_test - Win32 Release"

+# Begin Source File

+

+SOURCE=tests\mysql_client_test.c

+# End Source File

+# End Target

+# End Project

+