CVS update: php31/ext/mysql
| From: | shane | Date: | Mon, 14 Sep 1998 16:56:30 +0000 |
| Subject: | CVS update: php31/ext/mysql | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-1062@lists.php.net to get a copy of this message | ||
Date: Monday September 14, 1998 @ 12:56
Author: shane
Update of /repository/php31/ext/mysql
In directory asf:/u2/tmp/cvs-serv18848/ext/mysql
Modified Files:
mysql.c mysql.dsp
Log Message:
Hmm, several things I've been working on that I don't remember specifics of.
mysql compiles with the latest windows stuff I've been working on with monty.
odbc fixes from 3.0 tree
adding gdlib to project (now that I have a reentrant version, still needs testing)
Index: php31/ext/mysql/mysql.c
diff -c php31/ext/mysql/mysql.c:2.11 php31/ext/mysql/mysql.c:2.12
*** php31/ext/mysql/mysql.c:2.11 Thu Sep 10 20:22:38 1998
--- php31/ext/mysql/mysql.c Mon Sep 14 12:56:29 1998
***************
*** 27,33 ****
+----------------------------------------------------------------------+
*/
! /* $Id: mysql.c,v 2.11 1998/09/11 00:22:38 zeev Exp $ */
/* TODO:
--- 27,33 ----
+----------------------------------------------------------------------+
*/
! /* $Id: mysql.c,v 2.12 1998/09/14 16:56:29 shane Exp $ */
/* TODO:
***************
*** 225,254 ****
#endif
/* FIXME */
! /*
! if
(cfg_get_long("mysql.allow_persistent",&MySQL_GLOBAL(php3_mysql_module).allow_persistent)==FAILURE)
{
MySQL_GLOBAL(php3_mysql_module).allow_persistent=1;
! }
! if
(cfg_get_long("mysql.max_persistent",&MySQL_GLOBAL(php3_mysql_module).max_persistent)==FAILURE)
{
MySQL_GLOBAL(php3_mysql_module).max_persistent=-1;
! }
! if
(cfg_get_long("mysql.max_links",&MySQL_GLOBAL(php3_mysql_module).max_links)==FAILURE)
{
MySQL_GLOBAL(php3_mysql_module).max_links=-1;
! }
! if
(cfg_get_string("mysql.default_host",&MySQL_GLOBAL(php3_mysql_module).default_host)==FAILURE
! || MySQL_GLOBAL(php3_mysql_module).default_host[0]==0) {
MySQL_GLOBAL(php3_mysql_module).default_host=NULL;
! }
! if
(cfg_get_string("mysql.default_user",&MySQL_GLOBAL(php3_mysql_module).default_user)==FAILURE
! || MySQL_GLOBAL(php3_mysql_module).default_user[0]==0) {
MySQL_GLOBAL(php3_mysql_module).default_user=NULL;
! }
! if
(cfg_get_string("mysql.default_password",&MySQL_GLOBAL(php3_mysql_module).default_password)==FAILURE
! || MySQL_GLOBAL(php3_mysql_module).default_password[0]==0) {
MySQL_GLOBAL(php3_mysql_module).default_password=NULL;
! }
! if
(cfg_get_long("mysql.default_port",&MySQL_GLOBAL(php3_mysql_module).default_port)==FAILURE
! || MySQL_GLOBAL(php3_mysql_module).default_port==0) {
#if !(WIN32|WINNT)
struct servent *serv_ptr;
char *env;
--- 225,253 ----
#endif
/* FIXME */
! // if
(cfg_get_long("mysql.allow_persistent",&MySQL_GLOBAL(php3_mysql_module).allow_persistent)==FAILURE)
{
MySQL_GLOBAL(php3_mysql_module).allow_persistent=1;
! // }
! // if
(cfg_get_long("mysql.max_persistent",&MySQL_GLOBAL(php3_mysql_module).max_persistent)==FAILURE)
{
MySQL_GLOBAL(php3_mysql_module).max_persistent=-1;
! // }
! // if
(cfg_get_long("mysql.max_links",&MySQL_GLOBAL(php3_mysql_module).max_links)==FAILURE)
{
MySQL_GLOBAL(php3_mysql_module).max_links=-1;
! // }
! // if
(cfg_get_string("mysql.default_host",&MySQL_GLOBAL(php3_mysql_module).default_host)==FAILURE
! // || MySQL_GLOBAL(php3_mysql_module).default_host[0]==0) {
MySQL_GLOBAL(php3_mysql_module).default_host=NULL;
! // }
! // if
(cfg_get_string("mysql.default_user",&MySQL_GLOBAL(php3_mysql_module).default_user)==FAILURE
! // || MySQL_GLOBAL(php3_mysql_module).default_user[0]==0) {
MySQL_GLOBAL(php3_mysql_module).default_user=NULL;
! // }
! // if
(cfg_get_string("mysql.default_password",&MySQL_GLOBAL(php3_mysql_module).default_password)==FAILURE
! // || MySQL_GLOBAL(php3_mysql_module).default_password[0]==0) {
MySQL_GLOBAL(php3_mysql_module).default_password=NULL;
! // }
! // if
(cfg_get_long("mysql.default_port",&MySQL_GLOBAL(php3_mysql_module).default_port)==FAILURE
! // || MySQL_GLOBAL(php3_mysql_module).default_port==0) {
#if !(WIN32|WINNT)
struct servent *serv_ptr;
char *env;
***************
*** 263,270 ****
#else
MySQL_GLOBAL(php3_mysql_module).default_port = MYSQL_PORT;
#endif
! }
! */
MySQL_GLOBAL(php3_mysql_module).num_persistent=0;
MySQL_GLOBAL(php3_mysql_module).le_result = register_list_destructors(mysql_free_result,NULL);
MySQL_GLOBAL(php3_mysql_module).le_link = register_list_destructors(_close_mysql_link,NULL);
--- 262,268 ----
#else
MySQL_GLOBAL(php3_mysql_module).default_port = MYSQL_PORT;
#endif
! // }
MySQL_GLOBAL(php3_mysql_module).num_persistent=0;
MySQL_GLOBAL(php3_mysql_module).le_result = register_list_destructors(mysql_free_result,NULL);
MySQL_GLOBAL(php3_mysql_module).le_link = register_list_destructors(_close_mysql_link,NULL);
***************
*** 411,417 ****
/* } END FIXME */
!
if (host && (tmp=strchr(host,':'))) {
*tmp=0;
tmp++;
--- 409,416 ----
/* } END FIXME */
! /* FIXME this causes an access violation in windows */
! #if !(WIN32|WINNT)
if (host && (tmp=strchr(host,':'))) {
*tmp=0;
tmp++;
***************
*** 419,425 ****
} else {
mysql_port = MySQL_GLOBAL(php3_mysql_module).default_port;
}
!
if (!MySQL_GLOBAL(php3_mysql_module).allow_persistent) {
persistent=0;
}
--- 418,425 ----
} else {
mysql_port = MySQL_GLOBAL(php3_mysql_module).default_port;
}
! #endif
!
if (!MySQL_GLOBAL(php3_mysql_module).allow_persistent) {
persistent=0;
}
***************
*** 651,656 ****
--- 651,657 ----
} else {
RETURN_TRUE;
}
+
}
void php3_mysql_create_db(INTERNAL_FUNCTION_PARAMETERS)
***************
*** 1093,1099 ****
RETURN_FALSE;
}
! return_value->value.lval = mysql_affected_rows(mysql);
return_value->type = IS_LONG;
}
--- 1094,1101 ----
RETURN_FALSE;
}
! /* WARNING 3.22.6 uses int64 */
! return_value->value.lval = (long)mysql_affected_rows(mysql);
return_value->type = IS_LONG;
}
***************
*** 1128,1134 ****
RETURN_FALSE;
}
! return_value->value.lval = mysql_insert_id(mysql);
return_value->type = IS_LONG;
}
--- 1130,1137 ----
RETURN_FALSE;
}
! /* WARNING 3.22.6 uses int64 */
! return_value->value.lval = (long)mysql_insert_id(mysql);
return_value->type = IS_LONG;
}
***************
*** 1265,1271 ****
RETURN_FALSE;
}
! return_value->value.lval = mysql_num_rows(mysql_result);
return_value->type = IS_LONG;
}
--- 1268,1275 ----
RETURN_FALSE;
}
! /* WARNING 3.22.6 uses int64 */
! return_value->value.lval = (long)mysql_num_rows(mysql_result);
return_value->type = IS_LONG;
}
Index: php31/ext/mysql/mysql.dsp
diff -c php31/ext/mysql/mysql.dsp:2.1 php31/ext/mysql/mysql.dsp:2.2
*** php31/ext/mysql/mysql.dsp:2.1 Thu Aug 27 17:07:14 1998
--- php31/ext/mysql/mysql.dsp Mon Sep 14 12:56:30 1998
***************
*** 69,75 ****
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /YX /FD /c
! # ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "c:\mysql\include" /I "./" /I
"../../" /I "../../main" /D "HAVE_MYSQL" /D "HAVE_ERRMSG_H"
/D "THREAD_SAFE" /D "DEBUG" /D "MSVC5" /D "COMPILE_DL" /D
"WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /I
/usr/src/phpcvs/php3" /I /usr/src/mysql/include" " " /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
--- 69,75 ----
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /YX /FD /c
! # ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "\src\mysql-3.22.6\include" /I
"./" /I "../../" /I "../../main" /D "HAVE_MYSQL" /D
"HAVE_ERRMSG_H" /D "THREAD_SAFE" /D "DEBUG" /D "MSVC5" /D
"COMPILE_DL" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /I
/usr/src/phpcvs/php3" /I /usr/src/mysql/include" " " /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
***************
*** 79,85 ****
# 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 /nologo /subsystem:windows /dll
/debug /machine:I386 /pdbtype:sept
! # ADD LINK32 phpsapi_core.lib mysqlclient.lib wsock32.lib 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 /subsystem:windows /dll /debug /machine:I386
/out:"c:\php31/php3_mysql.dll" /pdbtype:sept /libpath:"c:\php31"
/libpath:"\src\mysql\lib_debug"
!ENDIF
--- 79,85 ----
# 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 /nologo /subsystem:windows /dll
/debug /machine:I386 /pdbtype:sept
! # ADD LINK32 phpsapi_core.lib libmySQL.lib wsock32.lib 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 /subsystem:windows /dll /debug /machine:I386
/out:"c:\php31/php3_mysql.dll" /pdbtype:sept /libpath:"c:\php31"
/libpath:"\src\mysql-3.22.6\lib_debug"
!ENDIF
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net