- MySQL now compiles right into the PHP 4 binary on Windows

diff --git a/ext/mysql/libmysql/libmysql.dsp b/ext/mysql/libmysql/libmysql.dsp
index 4eaea585c8c1db65718472c44ca5e9aa0814911a..1630067bb64bc9eb5b28e0a278c90874bb08f41f 100644 (file)
--- a/ext/mysql/libmysql/libmysql.dsp
+++ b/ext/mysql/libmysql/libmysql.dsp
@@ -4,7 +4,7 @@
 \r
 # TARGTYPE "Win32 (x86) Static Library" 0x0104\r
 \r
-CFG=libmysql - Win32 Debug\r
+CFG=libmysql - Win32 Debug_TS\r
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
 !MESSAGE use the Export Makefile command and run\r
 !MESSAGE \r
@@ -13,12 +13,13 @@ CFG=libmysql - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE\r
 !MESSAGE by defining the macro CFG on the command line. For example:\r
 !MESSAGE \r
-!MESSAGE NMAKE /f "libmysql.mak" CFG="libmysql - Win32 Debug"\r
+!MESSAGE NMAKE /f "libmysql.mak" CFG="libmysql - Win32 Debug_TS"\r
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
-!MESSAGE "libmysql - Win32 Release" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "libmysql - Win32 Debug" (based on "Win32 (x86) Static Library")\r
+!MESSAGE "libmysql - Win32 Debug_TS" (based on "Win32 (x86) Static Library")\r
+!MESSAGE "libmysql - Win32 Release_TS" (based on "Win32 (x86) Static Library")\r
+!MESSAGE "libmysql - Win32 Release_TS_inline" (based on "Win32 (x86) Static Library")\r
 !MESSAGE \r
 \r
 # Begin Project\r
@@ -28,20 +29,43 @@ CFG=libmysql - Win32 Debug
 CPP=cl.exe\r
 RSC=rc.exe\r
 \r
-!IF  "$(CFG)" == "libmysql - Win32 Release"\r
+!IF  "$(CFG)" == "libmysql - Win32 Debug_TS"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 1\r
+# PROP BASE Output_Dir "Debug_TS"\r
+# PROP BASE Intermediate_Dir "Debug_TS"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 1\r
+# PROP Output_Dir "Debug_TS"\r
+# PROP Intermediate_Dir "Debug_TS"\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "__WIN32__" /YX /FD /GZ  /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "__WIN32__" /YX /FD /GZ  /c\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
+# ADD RSC /l 0x409 /d "_DEBUG"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LIB32=link.exe -lib\r
+# ADD BASE LIB32 /nologo\r
+# ADD LIB32 /nologo\r
+\r
+!ELSEIF  "$(CFG)" == "libmysql - Win32 Release_TS"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Release"\r
-# PROP BASE Intermediate_Dir "Release"\r
+# PROP BASE Output_Dir "Release_TS"\r
+# PROP BASE Intermediate_Dir "Release_TS"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Release"\r
-# PROP Intermediate_Dir "Release"\r
+# PROP Output_Dir "Release_TS"\r
+# PROP Intermediate_Dir "Release_TS"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r
+# ADD BASE CPP /nologo /W3 /GX /O2 /I "." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "__WIN32__" /YX /FD /c\r
+# ADD CPP /nologo /W3 /GX /O2 /I "." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "__WIN32__" /YX /FD /c\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
@@ -51,22 +75,22 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo\r
 # ADD LIB32 /nologo\r
 \r
-!ELSEIF  "$(CFG)" == "libmysql - Win32 Debug"\r
+!ELSEIF  "$(CFG)" == "libmysql - Win32 Release_TS_inline"\r
 \r
 # PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "libmysql___Win32_Debug"\r
-# PROP BASE Intermediate_Dir "libmysql___Win32_Debug"\r
+# PROP BASE Use_Debug_Libraries 0\r
+# PROP BASE Output_Dir "Release_TS_inline"\r
+# PROP BASE Intermediate_Dir "Release_TS_inline"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "libmysql___Win32_Debug"\r
-# PROP Intermediate_Dir "libmysql___Win32_Debug"\r
+# PROP Use_Debug_Libraries 0\r
+# PROP Output_Dir "Release_TS_inline"\r
+# PROP Intermediate_Dir "Release_TS_inline"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ  /c\r
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ  /c\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
-# ADD RSC /l 0x409 /d "_DEBUG"\r
+# ADD BASE CPP /nologo /W3 /GX /O2 /I "." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "__WIN32__" /YX /FD /c\r
+# ADD CPP /nologo /W3 /GX /O2 /I "." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "__WIN32__" /YX /FD /c\r
+# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
+# ADD RSC /l 0x409 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
@@ -78,15 +102,376 @@ LIB32=link.exe -lib
 \r
 # Begin Target\r
 \r
-# Name "libmysql - Win32 Release"\r
-# Name "libmysql - Win32 Debug"\r
+# Name "libmysql - Win32 Debug_TS"\r
+# Name "libmysql - Win32 Release_TS"\r
+# Name "libmysql - Win32 Release_TS_inline"\r
 # Begin Group "Source Files"\r
 \r
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
+# Begin Source File\r
+\r
+SOURCE=.\array.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\bchange.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\bmove.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\bmove_upp.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\ct_init.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\ctype-latin1.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\dbug.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\default.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\dll.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\errmsg.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\errors.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\get_password.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\int2str.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\is_prefix.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libmysql.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\list.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\longlong2str.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\mf_casecnv.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\mf_dirname.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\mf_fn_ext.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\mf_format.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\mf_loadpath.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\mf_pack.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\mf_path.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\mf_unixpath.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\mf_wcomp.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\mulalloc.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\my_alloc.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\my_compress.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\my_create.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\my_delete.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\my_div.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\my_error.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\my_fopen.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\my_getwd.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\my_init.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\my_malloc.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\my_messnc.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\my_net.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\my_once.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\my_open.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\my_pthread.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\my_read.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\my_realloc.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\my_static.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\my_tempnam.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\my_thr_init.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\my_wincond.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\my_write.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\net.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\password.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\safemalloc.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\str2int.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\strcend.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\strcont.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\strend.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\strfill.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\string.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\strinstr.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\strmake.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\strmov.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\strnmov.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\strtoll.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\strtoull.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\strxmov.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\thr_mutex.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\typelib.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\violite.c\r
+# End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
 \r
 # PROP Default_Filter "h;hpp;hxx;hm;inl"\r
+# Begin Source File\r
+\r
+SOURCE=.\acconfig.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\config-win32.h"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\dbug.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\errmsg.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\global.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\m_ctype.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\m_string.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\my_alarm.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\my_dir.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\my_list.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\my_net.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\my_pthread.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\my_static.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\my_sys.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\mysql.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\mysql_com.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\mysql_version.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\mysqld_error.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\mysys_err.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\mysys_priv.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\thr_alarm.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\violite.h\r
+# End Source File\r
 # End Group\r
 # End Target\r
 # End Project\r

diff --git a/ext/mysql/libmysql/my_wincond.c b/ext/mysql/libmysql/my_wincond.c
new file mode 100644 (file)
index 0000000..f33a197
--- /dev/null
+++ b/ext/mysql/libmysql/my_wincond.c
@@ -0,0 +1,139 @@
+/* Copyright (C) 2000 Monty Program KB
+
+   This software is distributed with NO WARRANTY OF ANY KIND.  No author or
+   distributor accepts any responsibility for the consequences of using it, or
+   for whether it serves any particular purpose or works at all, unless he or
+   she says so in writing.  Refer to the Free Public License (the "License")
+   for full details.
+
+   Every copy of this file must include a copy of the License, normally in a
+   plain ASCII text file named PUBLIC. The License grants you the right to
+   copy, modify and redistribute this file, but only under certain conditions
+   described in the License.  Among other things, the License requires that
+   the copyright notice and this notice be preserved on all copies. */
+
+
+/*****************************************************************************
+** The following is a simple implementation of posix conditions
+*****************************************************************************/
+
+#include "mysys_priv.h"
+#if defined(THREAD) && defined(__WIN32__)
+#include <m_string.h>
+#undef getpid
+#include <process.h>
+#include <sys/timeb.h>
+
+int pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr)
+{
+  cond->waiting=0;
+  cond->semaphore=CreateSemaphore(NULL,0,0x7FFFFFFF,NullS);
+  if (!cond->semaphore)
+    return ENOMEM;
+  return 0;
+}
+
+int pthread_cond_destroy(pthread_cond_t *cond)
+{
+       return CloseHandle(cond->semaphore) ? 0 : EINVAL;
+}
+
+
+int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
+{
+  InterlockedIncrement(&cond->waiting);
+  LeaveCriticalSection(mutex);
+  WaitForSingleObject(cond->semaphore,INFINITE);
+  InterlockedDecrement(&cond->waiting);
+  EnterCriticalSection(mutex);
+  return 0 ;
+}
+
+int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
+                           struct timespec *abstime)
+{
+  struct _timeb curtime;
+  int result;
+  long timeout;
+  _ftime(&curtime);
+  timeout= ((long) (abstime->tv_sec - curtime.time)*1000L +
+                   (long)((abstime->tv_nsec/1000) - curtime.millitm)/1000L);
+  if (timeout < 0)                             /* Some safety */
+    timeout = 0L;
+  InterlockedIncrement(&cond->waiting);
+  LeaveCriticalSection(mutex);
+  result=WaitForSingleObject(cond->semaphore,timeout);
+  InterlockedDecrement(&cond->waiting);
+  EnterCriticalSection(mutex);
+
+  return result == WAIT_TIMEOUT ? ETIMEDOUT : 0;
+}
+
+
+int pthread_cond_signal(pthread_cond_t *cond)
+{
+  long prev_count;
+  if (cond->waiting)
+    ReleaseSemaphore(cond->semaphore,1,&prev_count);
+  return 0;
+}
+
+
+int pthread_cond_broadcast(pthread_cond_t *cond)
+{
+  long prev_count;
+  if (cond->waiting)
+    ReleaseSemaphore(cond->semaphore,cond->waiting,&prev_count);
+  return 0 ;
+}
+
+
+int pthread_attr_init(pthread_attr_t *connect_att)
+{
+  connect_att->dwStackSize     = 0;
+  connect_att->dwCreatingFlag  = 0;
+  connect_att->priority                = 0;
+  return 0;
+}
+
+int pthread_attr_setstacksize(pthread_attr_t *connect_att,DWORD stack)
+{
+  connect_att->dwStackSize=stack;
+  return 0;
+}
+
+int pthread_attr_setprio(pthread_attr_t *connect_att,int priority)
+{
+  connect_att->priority=priority;
+  return 0;
+}
+
+int pthread_attr_destroy(pthread_attr_t *connect_att)
+{
+  bzero((gptr) connect_att,sizeof(*connect_att));
+  return 0;
+}
+
+/****************************************************************************
+** Fix localtime_r() to be a bit safer
+****************************************************************************/
+
+struct tm *localtime_r(const time_t *timep,struct tm *tmp)
+{
+  if (*timep == (time_t) -1)                   /* This will crash win32 */
+  {
+    bzero(tmp,sizeof(*tmp));
+  }
+  else
+  {
+    struct tm *res=localtime(timep);
+    if (!res)                                   /* Wrong date */
+    {
+      bzero(tmp,sizeof(*tmp));                  /* Keep things safe */
+      return 0;
+    }
+    *tmp= *res;
+  }
+  return tmp;
+}
+#endif /* __WIN32__ */

diff --git a/main/config.w32.h b/main/config.w32.h
index 5ed74e38d4e17e49319021f654c660e61f9bd58c..f078785d3d0dfaf18b94491f1f23978db8a6e6e7 100644 (file)
--- a/main/config.w32.h
+++ b/main/config.w32.h
@@ -12,6 +12,9 @@
 /* set to enable bcmath */
 #define WITH_BCMATH 1
 
+/* set to enable mysql */
+#define HAVE_MYSQL 1
+
 /* set to enable bundled PCRE library */
 #define HAVE_BUNDLED_PCRE      1
 

diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c
index fd378a3dffa85f35faf33b077d1a00a8210412d7..2903c80d4bff80c2d3aee339b186848eae419af9 100644 (file)
--- a/main/internal_functions_win32.c
+++ b/main/internal_functions_win32.c
@@ -55,6 +55,7 @@
 #include "ext/odbc/php_odbc.h"
 #include "ext/session/php_session.h"
 #include "ext/xml/php_xml.h"
+#include "ext/mysql/php_mysql.h"
 
 /* SNMP has to be moved to ext */
 /* #include "dl/snmp/php_snmp.h" */
@@ -89,7 +90,8 @@ zend_module_entry *php_builtin_extensions[] = {
        phpext_output_ptr,
        phpext_array_ptr,
        phpext_assert_ptr,
-       phpext_xml_ptr
+       phpext_xml_ptr,
+       phpext_mysql_ptr
 };
 
 #define EXTCOUNT (sizeof(php_builtin_extensions)/sizeof(zend_module_entry *))

diff --git a/php4dllts.dsp b/php4dllts.dsp
index 151c92935d9f777d0ca403f43a3c6cddb3ebe311..48ac55c033d83dce45760ccdf209a28139e3d12b 100644 (file)
--- a/php4dllts.dsp
+++ b/php4dllts.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "regex" /I "..\bindlib_w32" /I "Zend" /I "tsrm" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D ZEND_DEBUG=1 /D "MSVC5" /D "ZTS" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /FR /YX /FD /GZ /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "regex" /I "..\bindlib_w32" /I "Zend" /I "tsrm" /I "ext\mysql\libmysql" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D ZEND_DEBUG=1 /D "MSVC5" /D "ZTS" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /FR /YX /FD /GZ /c\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40d /d "_DEBUG"\r
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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 /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /out:"Debug_TS/php4ts_debug.dll" /pdbtype:sept /libpath:"TSRM\Debug_TS" /libpath:"Zend\Debug_TS" /libpath:"..\bindlib_w32\Debug"\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /out:"Debug_TS/php4ts_debug.dll" /pdbtype:sept /libpath:"TSRM\Debug_TS" /libpath:"Zend\Debug_TS" /libpath:"..\bindlib_w32\Debug" /libpath:"ext\mysql\libmysql\Debug_TS"\r
 \r
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"\r
 \r
@@ -70,7 +70,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "regex" /I "..\bindlib_w32" /I "Zend" /I "tsrm" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D ZEND_DEBUG=0 /D "MSVC5" /D "ZTS" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /FR /YX /FD /c\r
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "regex" /I "..\bindlib_w32" /I "Zend" /I "tsrm" /I "ext\mysql\libmysql" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D ZEND_DEBUG=0 /D "MSVC5" /D "ZTS" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /FR /YX /FD /c\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40d /d "NDEBUG"\r
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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 /nologo /dll /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"Release_TS/php4ts.dll" /libpath:"TSRM\Release_TS" /libpath:"Zend\Release_TS" /libpath:"..\bindlib_w32\Release"\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"Release_TS/php4ts.dll" /libpath:"TSRM\Release_TS" /libpath:"Zend\Release_TS" /libpath:"..\bindlib_w32\Release" /libpath:"ext\mysql\libmysql\Release_TS"\r
 \r
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"\r
 \r
@@ -97,7 +97,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "regex" /I "..\bindlib_w32" /I "Zend" /I "tsrm" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /FR /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "regex" /I "..\bindlib_w32" /I "Zend" /I "tsrm" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /c\r
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "regex" /I "..\bindlib_w32" /I "Zend" /I "tsrm" /I "ext\mysql\libmysql" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /c\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40d /d "NDEBUG"\r
@@ -107,7 +107,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"Release_TS/php4ts.dll" /libpath:"TSRM\Release_TS" /libpath:"Zend\Release_TS" /libpath:"..\bindlib_w32\Release"\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"Release_TS_inline/php4ts.dll" /libpath:"TSRM\Release_TS_inline" /libpath:"Zend\Release_TS_inline" /libpath:"..\bindlib_w32\Release"\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"Release_TS_inline/php4ts.dll" /libpath:"TSRM\Release_TS_inline" /libpath:"Zend\Release_TS_inline" /libpath:"..\bindlib_w32\Release" /libpath:"ext\mysql\libmysql\Release_TS_inline"\r
 \r
 !ENDIF \r
 \r
@@ -437,6 +437,10 @@ SOURCE=.\ext\mcal\php_mcal.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\ext\mysql\php_mysql.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\ext\odbc\php_odbc.c\r
 # End Source File\r
 # Begin Source File\r
@@ -590,6 +594,10 @@ SOURCE=.\ext\mcal\php_mcal.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\ext\mysql\php_mysql.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\ext\odbc\php_odbc.h\r
 # End Source File\r
 # Begin Source File\r

diff --git a/php4ts.dsw b/php4ts.dsw
index 519a96a5392f57f8888f2dc2c3ccd2cf74ded8db..754823300f1c29d7889f14461cad451c5b999bcc 100644 (file)
--- a/php4ts.dsw
+++ b/php4ts.dsw
@@ -30,6 +30,18 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
+Project: "libmysql"=.\ext\mysql\libmysql\libmysql.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
 Project: "php4dllts"=.\php4dllts.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
@@ -44,6 +56,9 @@ Package=<4>
     Begin Project Dependency\r
     Project_Dep_Name TSRM\r
     End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libmysql\r
+    End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
@@ -74,6 +89,9 @@ Package=<4>
     Begin Project Dependency\r
     Project_Dep_Name php4dllts\r
     End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name mysql\r
+    End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r