|
|
| Applications |
| Mailing Lists |
| Miscellaneous |
| Operating Systems |
| Programming |
PHP mysqlnd svn commit: r1103 - in trunk: mysqlnd php5/ext/mysql php5/ext/mysqli php6/ext/mysql php6/ext/mysqli
Date: Tue Oct 16 2007 - 16:11:31 EDT
Author: ahristov
Date: 2007-10-16 22:11:29 +0200 (Tue, 16 Oct 2007)
New Revision: 1103
Added:
trunk/php5/ext/mysql/php_mysql_structs.h trunk/php6/ext/mysql/php_mysql_structs.h Modified:
trunk/mysqlnd/config.w32 trunk/mysqlnd/config9.m4 trunk/mysqlnd/mysqlnd.c trunk/mysqlnd/mysqlnd.h trunk/mysqlnd/mysqlnd_alloc.c trunk/mysqlnd/mysqlnd_debug.c trunk/mysqlnd/mysqlnd_debug.h trunk/mysqlnd/mysqlnd_enum_n_def.h trunk/mysqlnd/mysqlnd_palloc.c trunk/mysqlnd/mysqlnd_palloc.h trunk/mysqlnd/mysqlnd_priv.h trunk/mysqlnd/mysqlnd_ps.c trunk/mysqlnd/mysqlnd_ps_codec.c trunk/mysqlnd/mysqlnd_qcache.c trunk/mysqlnd/mysqlnd_result.c trunk/mysqlnd/mysqlnd_result.h trunk/mysqlnd/mysqlnd_result_meta.c trunk/mysqlnd/mysqlnd_result_meta.h trunk/mysqlnd/mysqlnd_statistics.c trunk/mysqlnd/mysqlnd_statistics.h trunk/mysqlnd/mysqlnd_structs.h trunk/mysqlnd/mysqlnd_wireprotocol.h trunk/mysqlnd/php_mysqlnd.h trunk/php5/ext/mysql/php_mysql.c trunk/php5/ext/mysql/php_mysql.h trunk/php5/ext/mysqli/config.m4 trunk/php5/ext/mysqli/config.w32 trunk/php5/ext/mysqli/mysqli.c trunk/php5/ext/mysqli/mysqli_api.c trunk/php5/ext/mysqli/mysqli_fe.c trunk/php5/ext/mysqli/mysqli_nonapi.c trunk/php5/ext/mysqli/mysqli_prop.c trunk/php5/ext/mysqli/mysqli_repl.c trunk/php5/ext/mysqli/mysqli_report.c trunk/php5/ext/mysqli/package.xml trunk/php5/ext/mysqli/php_mysqli.h trunk/php5/ext/mysqli/php_mysqli_structs.h trunk/php6/ext/mysql/config.w32 trunk/php6/ext/mysql/php_mysql.c trunk/php6/ext/mysql/php_mysql.h trunk/php6/ext/mysqli/config.w32 trunk/php6/ext/mysqli/mysqli.c trunk/php6/ext/mysqli/mysqli_api.c trunk/php6/ext/mysqli/mysqli_driver.c trunk/php6/ext/mysqli/mysqli_fe.c trunk/php6/ext/mysqli/mysqli_nonapi.c trunk/php6/ext/mysqli/mysqli_prop.c trunk/php6/ext/mysqli/mysqli_repl.c trunk/php6/ext/mysqli/mysqli_report.c trunk/php6/ext/mysqli/mysqli_warning.c trunk/php6/ext/mysqli/php_mysqli.h trunk/php6/ext/mysqli/php_mysqli_structs.hLog:
Sync with HEAD/5_3 CVS
Modified: trunk/mysqlnd/config.w32
- trunk/mysqlnd/config.w32 2007-10-15 15:45:46 UTC (rev 1102)
+++ trunk/mysqlnd/config.w32 2007-10-16 20:11:29 UTC (rev 1103)
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1 2007/07/25 23:47:32 jani Exp $
+// $Id: config.w32,v 1.4.2.2 2007/10/05 21:23:56 andrey Exp $ // vim:ft=javascript
mysqld_source = "";
Modified: trunk/mysqlnd/config9.m4
- trunk/mysqlnd/config9.m4 2007-10-15 15:45:46 UTC (rev 1102)
+++ trunk/mysqlnd/config9.m4 2007-10-16 20:11:29 UTC (rev 1103)
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config9.m4,v 1.2 2007/07/26 14:54:49 jani Exp $
+dnl $Id: config9.m4,v 1.3.2.2 2007/10/05 21:23:56 andrey Exp $ dnl config.m4 for mysqlnd driver
dnl If some extension uses mysqlnd it will get compiled in PHP core
Modified: trunk/mysqlnd/mysqlnd.c
- trunk/mysqlnd/mysqlnd.c 2007-10-15 15:45:46 UTC (rev 1102) +++ trunk/mysqlnd/mysqlnd.c 2007-10-16 20:11:29 UTC (rev 1103) @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */
-/* $Id: header,v 1.17 2006/01/01 13:09:48 sniper Exp $ */
+/* $Id: mysqlnd.c,v 1.5.2.2 2007/10/05 21:23:56 andrey Exp $ */
#include "php.h" #include "mysqlnd.h" #include "mysqlnd_wireprotocol.h"
Modified: trunk/mysqlnd/mysqlnd.h
- trunk/mysqlnd/mysqlnd.h 2007-10-15 15:45:46 UTC (rev 1102) +++ trunk/mysqlnd/mysqlnd.h 2007-10-16 20:11:29 UTC (rev 1103) @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */
-/* $Id: header,v 1.17 2006/01/01 13:09:48 sniper Exp $ */
+/* $Id: mysqlnd.h,v 1.3.2.2 2007/10/05 21:23:56 andrey Exp $ */
#ifndef MYSQLND_H
#define MYSQLND_H
Modified: trunk/mysqlnd/mysqlnd_alloc.c
- trunk/mysqlnd/mysqlnd_alloc.c 2007-10-15 15:45:46 UTC (rev 1102) +++ trunk/mysqlnd/mysqlnd_alloc.c 2007-10-16 20:11:29 UTC (rev 1103) @@ -19,7 +19,7 @@
*/
-/* $Id: header,v 1.17 2006/01/01 13:09:48 sniper Exp $ */
+/* $Id: mysqlnd_alloc.c,v 1.1.2.2 2007/10/07 21:47:36 davidw Exp $ */
#include "php.h" #include "mysqlnd.h" #include "mysqlnd_priv.h"
@@ -174,7 +174,7 @@
void mysqlnd_alloc_zval_ptr_dtor(zval **zv, MYSQLND_ZVAL_CACHE * const cache)
{
- if (!cache || ZVAL_REFCOUNT(*zv) > 1 || cache->max_items == cache->free_items) {
+ if (!cache || Z_REFCOUNT_PP(zv) > 1 || cache->max_items == cache->free_items) {
#ifndef MYSQLND_SILENT
php_printf("[mysqlnd_alloc_zval_ptr_dtor %p]1 last_added-1=%p *zv=%p\n", cache->free_list->last_added, *zv); #endif
Modified: trunk/mysqlnd/mysqlnd_debug.c
- trunk/mysqlnd/mysqlnd_debug.c 2007-10-15 15:45:46 UTC (rev 1102) +++ trunk/mysqlnd/mysqlnd_debug.c 2007-10-16 20:11:29 UTC (rev 1103) @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */
-/* $Id: header,v 1.17 2006/01/01 13:09:48 sniper Exp $ */
+/* $Id: mysqlnd_debug.c,v 1.1.2.2 2007/10/05 21:23:56 andrey Exp $ */
#include "php.h"
#include "mysqlnd.h"
Modified: trunk/mysqlnd/mysqlnd_debug.h
- trunk/mysqlnd/mysqlnd_debug.h 2007-10-15 15:45:46 UTC (rev 1102) +++ trunk/mysqlnd/mysqlnd_debug.h 2007-10-16 20:11:29 UTC (rev 1103) @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */
-/* $Id: header,v 1.17 2006/01/01 13:09:48 sniper Exp $ */
+/* $Id: mysqlnd_debug.h,v 1.1.2.2 2007/10/05 21:23:56 andrey Exp $ */
#ifndef MYSQLND_DEBUG_H
#define MYSQLND_DEBUG_H
Modified: trunk/mysqlnd/mysqlnd_enum_n_def.h
- trunk/mysqlnd/mysqlnd_enum_n_def.h 2007-10-15 15:45:46 UTC (rev 1102) +++ trunk/mysqlnd/mysqlnd_enum_n_def.h 2007-10-16 20:11:29 UTC (rev 1103) @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */
-/* $Id: header,v 1.17 2006/01/01 13:09:48 sniper Exp $ */
+/* $Id: mysqlnd_enum_n_def.h,v 1.2.2.2 2007/10/05 21:23:56 andrey Exp $ */ #ifndef MYSQLND_ENUM_N_DEF_H #define MYSQLND_ENUM_N_DEF_H
Modified: trunk/mysqlnd/mysqlnd_palloc.c
- trunk/mysqlnd/mysqlnd_palloc.c 2007-10-15 15:45:46 UTC (rev 1102) +++ trunk/mysqlnd/mysqlnd_palloc.c 2007-10-16 20:11:29 UTC (rev 1103) @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */
-/* $Id: header,v 1.17 2006/01/01 13:09:48 sniper Exp $ */
+/* $Id: mysqlnd_palloc.c,v 1.2.2.3 2007/10/07 21:47:36 davidw Exp $ */
#include "php.h" #include "mysqlnd.h" #include "mysqlnd_priv.h" @@ -76,7 +76,7 @@ INIT_PZVAL(&(ret->block[i].zv)); ZVAL_NULL(&(ret->block[i].zv)); /* Assure it will never be freed before MSHUTDOWN */
- ZVAL_ADDREF(&(ret->block[i].zv));
+ Z_ADDREF_P(&(ret->block[i].zv)); /* 2. Add to the free list */ *(--ret->free_list.last_added) = &(ret->block[i]); } @@ -328,7 +328,7 @@ } else { /* This will set the refcount to 1, increase it, to keep the variable */ INIT_PZVAL(&((mysqlnd_zval *) ret)->zv);
- ZVAL_ADDREF(&(((mysqlnd_zval *)ret)->zv));
+ Z_ADDREF_P(&(((mysqlnd_zval *)ret)->zv)); } DBG_INF_FMT("allocated=%d ret=%p", *allocated, ret); @@ -347,7 +347,7 @@ thd_cache, thd_cache->parent? thd_cache->parent->block:NULL, thd_cache->parent? thd_cache->parent->last_in_block:NULL,
- *zv, ZVAL_REFCOUNT(*zv), type);
+ *zv, Z_REFCOUNT_PP(zv), type); *copy_ctor_called = FALSE; /* Check whether cache is used and the zval is from the cache */ if (!thd_cache || !(cache = thd_cache->parent) || ((char *)*zv < (char *)thd_cache->parent->block || @@ -359,7 +359,7 @@ */ if (type == MYSQLND_RES_PS_BUF || type == MYSQLND_RES_PS_UNBUF) { ; /* do nothing, zval_ptr_dtor will do the job*/
- } else if (ZVAL_REFCOUNT(*zv) > 1) {
+ } else if (Z_REFCOUNT_PP(zv) > 1) { /* Not a prepared statement, then we have to call copy_ctor and then zval_ptr_dtor() @@ -388,8 +388,8 @@ } /* The zval is from our cache */
- /* refcount is always > 1, because we call ZVAL_ADDREF(). Thus test refcount > 2 */
- if (ZVAL_REFCOUNT(*zv) > 2) {
+ /* refcount is always > 1, because we call Z_ADDREF_P(). Thus test refcount > 2 */ + if (Z_REFCOUNT_PP(zv) > 2) { /* Because the zval is first element in mysqlnd_zval structure, then we can do upcasting from zval to mysqlnd_zval here. Because we know that this @@ -435,7 +435,7 @@ ++cache->put_hits; ++cache->free_items; ((mysqlnd_zval *)*zv)->point_type = MYSQLND_POINTS_FREE;
- ZVAL_DELREF(*zv); /* Make it 1 */
+ Z_DELREF_PP(zv); /* Make it 1 */ ZVAL_NULL(*zv); #ifdef ZTS memset(&((mysqlnd_zval *)*zv)->thread_id, 0, sizeof(THREAD_T));
Modified: trunk/mysqlnd/mysqlnd_palloc.h
- trunk/mysqlnd/mysqlnd_palloc.h 2007-10-15 15:45:46 UTC (rev 1102) +++ trunk/mysqlnd/mysqlnd_palloc.h 2007-10-16 20:11:29 UTC (rev 1103) @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */
-/* $Id: header,v 1.17 2006/01/01 13:09:48 sniper Exp $ */
+/* $Id: mysqlnd_palloc.h,v 1.2.2.2 2007/10/05 21:23:56 andrey Exp $ */ #ifndef MYSQLND_PALLOC_H #define MYSQLND_PALLOC_H
Modified: trunk/mysqlnd/mysqlnd_priv.h
- trunk/mysqlnd/mysqlnd_priv.h 2007-10-15 15:45:46 UTC (rev 1102) +++ trunk/mysqlnd/mysqlnd_priv.h 2007-10-16 20:11:29 UTC (rev 1103) @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */
-/* $Id: header,v 1.17 2006/01/01 13:09:48 sniper Exp $ */
+/* $Id: mysqlnd_priv.h,v 1.4.2.2 2007/10/05 21:23:56 andrey Exp $ */
#ifndef MYSQLND_PRIV_H
#define MYSQLND_PRIV_H
Modified: trunk/mysqlnd/mysqlnd_ps.c
- trunk/mysqlnd/mysqlnd_ps.c 2007-10-15 15:45:46 UTC (rev 1102) +++ trunk/mysqlnd/mysqlnd_ps.c 2007-10-16 20:11:29 UTC (rev 1103) @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */
-/* $Id: header,v 1.17 2006/01/01 13:09:48 sniper Exp $ */
+/* $Id: mysqlnd_ps.c,v 1.3.2.3 2007/10/07 21:47:36 davidw Exp $ */
#include "php.h"
#include "mysqlnd.h"
#include "mysqlnd_wireprotocol.h"
@@ -1149,7 +1149,7 @@
DBG_INF_FMT("%d is of type %d", i, stmt->param_bind[i].type);
if (stmt->param_bind[i].type != MYSQL_TYPE_LONG_BLOB) {
/* Prevent from freeing */
- ZVAL_ADDREF(stmt->param_bind[i].zv);
+ Z_ADDREF_P(stmt->param_bind[i].zv);
/* Don't update is_ref, or we will leak during conversion */
} else {
stmt->param_bind[i].zv = NULL;
@@ -1197,7 +1197,7 @@
stmt->result_bind = result_bind;
for (i = 0; i < stmt->field_count; i++) {
/* Prevent from freeing */
- ZVAL_ADDREF(stmt->result_bind[i].zv);
+ Z_ADDREF_P(stmt->result_bind[i].zv);
/*
Don't update is_ref !!! it's not our job
Otherwise either 009.phpt or mysqli_stmt_bind_result.phpt
@@ -1494,12 +1494,12 @@
for (i = 0; i < stmt->field_count; i++) {
/* Let's try with no cache */
if (stmt->result_bind[i].bound == TRUE) {
- DBG_INF_FMT("%d has refcount=%u", i, ZVAL_REFCOUNT(stmt->result_bind[i].zv));
+ DBG_INF_FMT("%d has refcount=%u", i, Z_REFCOUNT_P(stmt->result_bind[i].zv));
/*
We have to separate the actual zval value of the bound
variable from our allocated zvals or we will face double-free
*/
- if (ZVAL_REFCOUNT(stmt->result_bind[i].zv) > 1) {
+ if (Z_REFCOUNT_P(stmt->result_bind[i].zv) > 1) {
#ifdef WE_DONT_COPY_IN_BUFFERED_AND_UNBUFFERED_BECAUSEOF_IS_REF
zval_copy_ctor(stmt->result_bind[i].zv);
#endif
Modified: trunk/mysqlnd/mysqlnd_ps_codec.c
- trunk/mysqlnd/mysqlnd_ps_codec.c 2007-10-15 15:45:46 UTC (rev 1102) +++ trunk/mysqlnd/mysqlnd_ps_codec.c 2007-10-16 20:11:29 UTC (rev 1103) @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */
-/* $Id: header,v 1.17 2006/01/01 13:09:48 sniper Exp $ */
+/* $Id: mysqlnd_ps_codec.c,v 1.3.2.2 2007/10/05 21:23:56 andrey Exp $ */
#include "php.h" #include "mysqlnd.h" #include "mysqlnd_wireprotocol.h"
Modified: trunk/mysqlnd/mysqlnd_qcache.c
- trunk/mysqlnd/mysqlnd_qcache.c 2007-10-15 15:45:46 UTC (rev 1102) +++ trunk/mysqlnd/mysqlnd_qcache.c 2007-10-16 20:11:29 UTC (rev 1103) @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */
-/* $Id: header,v 1.17 2006/01/01 13:09:48 sniper Exp $ */
+/* $Id: mysqlnd_qcache.c,v 1.2.2.2 2007/10/05 21:23:56 andrey Exp $ */
#include "php.h" #include "mysqlnd.h" #include "mysqlnd_priv.h"
Modified: trunk/mysqlnd/mysqlnd_result.c
- trunk/mysqlnd/mysqlnd_result.c 2007-10-15 15:45:46 UTC (rev 1102) +++ trunk/mysqlnd/mysqlnd_result.c 2007-10-16 20:11:29 UTC (rev 1103) @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */
-/* $Id: header,v 1.17 2006/01/01 13:09:48 sniper Exp $ */
+/* $Id: mysqlnd_result.c,v 1.4.2.3 2007/10/07 21:47:36 davidw Exp $ */
#include "php.h" #include "mysqlnd.h" #include "mysqlnd_wireprotocol.h" @@ -539,10 +539,10 @@ } /* Forbid ZE to free it, we will clean it */@@ -1138,7 +1138,7 @@
- ZVAL_ADDREF(data);
+ Z_ADDREF_P(data); if ((flags & MYSQLND_FETCH_BOTH) == MYSQLND_FETCH_BOTH) {
- ZVAL_ADDREF(data);
+ Z_ADDREF_P(data); } if (flags & MYSQLND_FETCH_NUM) { zend_hash_next_index_insert(row_ht, &data, sizeof(zval *), NULL); @@ -671,10 +671,10 @@ Let us later know what to do with this zval. If ref_count > 1, we will just decrease it, otherwise free it. zval_ptr_dtor() make this very easy job. */
- ZVAL_ADDREF(data);
+ Z_ADDREF_P(data); if ((flags & MYSQLND_FETCH_BOTH) == MYSQLND_FETCH_BOTH) {
- ZVAL_ADDREF(data);
+ Z_ADDREF_P(data); } if (flags & MYSQLND_FETCH_NUM) { zend_hash_next_index_insert(Z_ARRVAL_P(row), &data, sizeof(zval *), NULL);
*return_value = **entry; zval_copy_ctor(return_value);
- ZVAL_REFCOUNT(return_value) = 1;
+ Z_SET_REFCOUNT_P(return_value, 1); zval_dtor(&row); DBG_VOID_RETURN;
Modified: trunk/mysqlnd/mysqlnd_result.h
- trunk/mysqlnd/mysqlnd_result.h 2007-10-15 15:45:46 UTC (rev 1102) +++ trunk/mysqlnd/mysqlnd_result.h 2007-10-16 20:11:29 UTC (rev 1103) @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */
-/* $Id: header,v 1.17 2006/01/01 13:09:48 sniper Exp $ */
+/* $Id: mysqlnd_result.h,v 1.2.2.2 2007/10/05 21:23:56 andrey Exp $ */
#ifndef MYSQLND_RESULT_H
#define MYSQLND_RESULT_H
Modified: trunk/mysqlnd/mysqlnd_result_meta.c
- trunk/mysqlnd/mysqlnd_result_meta.c 2007-10-15 15:45:46 UTC (rev 1102) +++ trunk/mysqlnd/mysqlnd_result_meta.c 2007-10-16 20:11:29 UTC (rev 1103) @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */
-/* $Id: header,v 1.17 2006/01/01 13:09:48 sniper Exp $ */
+/* $Id: mysqlnd_result_meta.c,v 1.3.2.2 2007/10/05 21:23:56 andrey Exp $ */
#include "php.h" #include "mysqlnd.h" #include "mysqlnd_priv.h"
Modified: trunk/mysqlnd/mysqlnd_result_meta.h
- trunk/mysqlnd/mysqlnd_result_meta.h 2007-10-15 15:45:46 UTC (rev 1102) +++ trunk/mysqlnd/mysqlnd_result_meta.h 2007-10-16 20:11:29 UTC (rev 1103) @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */
-/* $Id: header,v 1.17 2006/01/01 13:09:48 sniper Exp $ */
+/* $Id: mysqlnd_result_meta.h,v 1.2.2.2 2007/10/05 21:23:56 andrey Exp $ */
#ifndef MYSQLND_RESULT_META_H
#define MYSQLND_RESULT_META_H
Modified: trunk/mysqlnd/mysqlnd_statistics.c
- trunk/mysqlnd/mysqlnd_statistics.c 2007-10-15 15:45:46 UTC (rev 1102) +++ trunk/mysqlnd/mysqlnd_statistics.c 2007-10-16 20:11:29 UTC (rev 1103) @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */
-/* $Id: header,v 1.17 2006/01/01 13:09:48 sniper Exp $ */
+/* $Id: mysqlnd_statistics.c,v 1.2.2.2 2007/10/05 21:23:56 andrey Exp $ */
#include "php.h" #include "mysqlnd.h" #include "mysqlnd_priv.h"
Modified: trunk/mysqlnd/mysqlnd_statistics.h
- trunk/mysqlnd/mysqlnd_statistics.h 2007-10-15 15:45:46 UTC (rev 1102) +++ trunk/mysqlnd/mysqlnd_statistics.h 2007-10-16 20:11:29 UTC (rev 1103) @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */
-/* $Id: header,v 1.17 2006/01/01 13:09:48 sniper Exp $ */
+/* $Id: mysqlnd_statistics.h,v 1.4.2.2 2007/10/05 21:23:56 andrey Exp $ */
#ifndef MYSQLND_STATISTICS_H
#define MYSQLND_STATISTICS_H
Modified: trunk/mysqlnd/mysqlnd_structs.h
- trunk/mysqlnd/mysqlnd_structs.h 2007-10-15 15:45:46 UTC (rev 1102) +++ trunk/mysqlnd/mysqlnd_structs.h 2007-10-16 20:11:29 UTC (rev 1103) @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */
-/* $Id: header,v 1.17 2006/01/01 13:09:48 sniper Exp $ */
+/* $Id: mysqlnd_structs.h,v 1.2.2.2 2007/10/05 21:23:56 andrey Exp $ */
#ifndef MYSQLND_STRUCTS_H
#define MYSQLND_STRUCTS_H
Modified: trunk/mysqlnd/mysqlnd_wireprotocol.h
- trunk/mysqlnd/mysqlnd_wireprotocol.h 2007-10-15 15:45:46 UTC (rev 1102) +++ trunk/mysqlnd/mysqlnd_wireprotocol.h 2007-10-16 20:11:29 UTC (rev 1103) @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */
-/* $Id: header,v 1.17 2006/01/01 13:09:48 sniper Exp $ */
+/* $Id: mysqlnd_wireprotocol.h,v 1.4.2.2 2007/10/05 21:23:56 andrey Exp $ */
#ifndef MYSQLND_WIREPROTOCOL_H
#define MYSQLND_WIREPROTOCOL_H
Modified: trunk/mysqlnd/php_mysqlnd.h
- trunk/mysqlnd/php_mysqlnd.h 2007-10-15 15:45:46 UTC (rev 1102)
+++ trunk/mysqlnd/php_mysqlnd.h 2007-10-16 20:11:29 UTC (rev 1103)
@@ -17,7 +17,7 @@
| Ulf Wendel <uw@php.net> |
+----------------------------------------------------------------------+
- $Id: php_mysqli.h,v 1.63 2007/01/01 09:29:26 sebastian Exp $ + $Id: php_mysqlnd.h,v 1.2.2.2 2007/10/05 21:23:56 andrey Exp $ */
#ifndef PHP_MYSQLND_H
Modified: trunk/php5/ext/mysql/php_mysql.c
- trunk/php5/ext/mysql/php_mysql.c 2007-10-15 15:45:46 UTC (rev 1102) +++ trunk/php5/ext/mysql/php_mysql.c 2007-10-16 20:11:29 UTC (rev 1103) @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */
-/* $Id: php_mysql.c,v 1.213.2.6.2.7 2007/02/24 02:17:25 helly Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.4 2007/10/08 16:14:56 andrey Exp $ */
/* TODO:
*
@@ -66,7 +66,7 @@
#endif
#include "php_ini.h"
-#include "php_mysql.h"
+#include "php_mysql_structs.h"
/* True globals, no need for thread safety */ static int le_result, le_link, le_plink; @@ -2065,7 +2065,7 @@
}
if (result_type & MYSQL_ASSOC) {
if (result_type & MYSQL_NUM) {
- ZVAL_ADDREF(data);
+ Z_ADDREF_P(data);
}
add_assoc_zval(return_value, mysql_field->name, data);
}
Modified: trunk/php5/ext/mysql/php_mysql.h
- trunk/php5/ext/mysql/php_mysql.h 2007-10-15 15:45:46 UTC (rev 1102) +++ trunk/php5/ext/mysql/php_mysql.h 2007-10-16 20:11:29 UTC (rev 1103) @@ -17,132 +17,18 @@ */
-/* $Id: php_mysql.h,v 1.37.2.1.2.1 2007/01/01 09:36:03 sebastian Exp $ */
+/* $Id: php_mysql.h,v 1.37.2.1.2.2.2.2 2007/10/08 16:14:56 andrey Exp $ */
#ifndef PHP_MYSQL_H
#define PHP_MYSQL_H
-#ifdef PHP_WIN32
-#define PHP_MYSQL_API __declspec(dllexport)
-#else
-#define PHP_MYSQL_API
-#endif
-
#if HAVE_MYSQL
-#ifdef ZTS
-#include "TSRM.h"
-#endif
-
-#ifndef TRUE
-#define TRUE 1
-#endif
-
-#ifndef FALSE
-#define FALSE 0
-#endif
-
-#if defined(HAVE_MYSQLND)
-#include "ext/mysqlnd/mysqlnd.h"
-#include "ext/mysql/mysql_mysqlnd.h"
-#else
-#include <mysql.h>
-#endif
-
-#if (MYSQL_VERSION_ID >= 40113 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50007 || HAVE_MYSQLND
-#define MYSQL_HAS_SET_CHARSET
-#endif
-
extern zend_module_entry mysql_module_entry;
-
#define mysql_module_ptr &mysql_module_entry
-PHP_MINIT_FUNCTION(mysql);
-PHP_RINIT_FUNCTION(mysql);
-PHP_MSHUTDOWN_FUNCTION(mysql);
-PHP_RSHUTDOWN_FUNCTION(mysql);
-PHP_MINFO_FUNCTION(mysql);
-
-PHP_FUNCTION(mysql_connect);
-PHP_FUNCTION(mysql_pconnect);
-PHP_FUNCTION(mysql_close);
-PHP_FUNCTION(mysql_select_db);
-#if MYSQL_VERSION_ID < 40000
-PHP_FUNCTION(mysql_create_db);
-PHP_FUNCTION(mysql_drop_db);
-#endif
-PHP_FUNCTION(mysql_query);
-PHP_FUNCTION(mysql_unbuffered_query);
-PHP_FUNCTION(mysql_db_query);
-PHP_FUNCTION(mysql_list_dbs);
-PHP_FUNCTION(mysql_list_tables);
-PHP_FUNCTION(mysql_list_fields);
-PHP_FUNCTION(mysql_list_processes);
-PHP_FUNCTION(mysql_error);
-PHP_FUNCTION(mysql_errno);
-PHP_FUNCTION(mysql_affected_rows);
-PHP_FUNCTION(mysql_insert_id);
-PHP_FUNCTION(mysql_result);
-PHP_FUNCTION(mysql_num_rows);
-PHP_FUNCTION(mysql_num_fields);
-PHP_FUNCTION(mysql_fetch_row);
-PHP_FUNCTION(mysql_fetch_array);
-PHP_FUNCTION(mysql_fetch_assoc);
-PHP_FUNCTION(mysql_fetch_object);
-PHP_FUNCTION(mysql_data_seek);
-PHP_FUNCTION(mysql_fetch_lengths);
-PHP_FUNCTION(mysql_fetch_field);
-PHP_FUNCTION(mysql_field_seek);
-PHP_FUNCTION(mysql_free_result);
-PHP_FUNCTION(mysql_field_name);
-PHP_FUNCTION(mysql_field_table);
-PHP_FUNCTION(mysql_field_len);
-PHP_FUNCTION(mysql_field_type);
-PHP_FUNCTION(mysql_field_flags);
-PHP_FUNCTION(mysql_escape_string);
-PHP_FUNCTION(mysql_real_escape_string);
-PHP_FUNCTION(mysql_get_client_info);
-PHP_FUNCTION(mysql_get_host_info);
-PHP_FUNCTION(mysql_get_proto_info);
-PHP_FUNCTION(mysql_get_server_info);
-PHP_FUNCTION(mysql_info);
-PHP_FUNCTION(mysql_stat);
-PHP_FUNCTION(mysql_thread_id);
-PHP_FUNCTION(mysql_client_encoding);
-PHP_FUNCTION(mysql_ping);
-
-ZEND_BEGIN_MODULE_GLOBALS(mysql)
- long default_link;
- long num_links,num_persistent;
- long max_links,max_persistent;
- long allow_persistent;
- long default_port;
- char *default_host, *default_user, *default_password;
- char *default_socket;
- char *connect_error;
- long connect_errno;
- long connect_timeout;
- long result_allocated;
- long trace_mode;
- long allow_local_infile;
-#ifdef HAVE_MYSQLND - MYSQLND_THD_ZVAL_PCACHE *mysqlnd_thd_zval_cache;
- MYSQLND_QCACHE *mysqlnd_qcache;
- long cache_size;
-#endif
-ZEND_END_MODULE_GLOBALS(mysql)
-
-#ifdef ZTS
-# define MySG(v) TSRMG(mysql_globals_id, zend_mysql_globals *, v)
#else
-# define MySG(v) (mysql_globals.v)
-#endif
-
-
-#else
-
#define mysql_module_ptr NULL
-
#endif
#define phpext_mysql_ptr mysql_module_ptr
Added: trunk/php5/ext/mysql/php_mysql_structs.h
- trunk/php5/ext/mysql/php_mysql_structs.h 2007-10-15 15:45:46 UTC (rev 1102) +++ trunk/php5/ext/mysql/php_mysql_structs.h 2007-10-16 20:11:29 UTC (rev 1103) @@ -0,0 +1,137 @@ +/* + +----------------------------------------------------------------------+ + | PHP Version 5 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997-2007 The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.01 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available through the world-wide-web at the following url: | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Author: Zeev Suraski <zeev@zend.com> | + | Andrey Hristov <andrey@php.net> | + +----------------------------------------------------------------------+ +*/ + + +/* $Id: php_mysql_structs.h,v 1.1.2.1 2007/10/08 16:14:56 andrey Exp $ */ + +#ifndef PHP_MYSQL_STRUCTS_H +#define PHP_MYSQL_STRUCTS_H + +#ifdef PHP_WIN32 +#define PHP_MYSQL_API __declspec(dllexport) +#else +#define PHP_MYSQL_API +#endif + +#ifdef ZTS +#include "TSRM.h" +#endif + +#ifndef TRUE +#define TRUE 1 +#endif + +#ifndef FALSE +#define FALSE 0 +#endif + +#if defined(HAVE_MYSQLND) +#include "ext/mysqlnd/mysqlnd.h" +#include "ext/mysql/mysql_mysqlnd.h" +#else +#include <mysql.h> +#endif + +#if (MYSQL_VERSION_ID >= 40113 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50007 || HAVE_MYSQLND +#define MYSQL_HAS_SET_CHARSET +#endif + +PHP_MINIT_FUNCTION(mysql); +PHP_RINIT_FUNCTION(mysql); +PHP_MSHUTDOWN_FUNCTION(mysql); +PHP_RSHUTDOWN_FUNCTION(mysql); +PHP_MINFO_FUNCTION(mysql); + +PHP_FUNCTION(mysql_connect); +PHP_FUNCTION(mysql_pconnect); +PHP_FUNCTION(mysql_close); +PHP_FUNCTION(mysql_select_db); +#if MYSQL_VERSION_ID < 40000 +PHP_FUNCTION(mysql_create_db); +PHP_FUNCTION(mysql_drop_db); +#endif +PHP_FUNCTION(mysql_query); +PHP_FUNCTION(mysql_unbuffered_query); +PHP_FUNCTION(mysql_db_query); +PHP_FUNCTION(mysql_list_dbs); +PHP_FUNCTION(mysql_list_tables); +PHP_FUNCTION(mysql_list_fields); +PHP_FUNCTION(mysql_list_processes); +PHP_FUNCTION(mysql_error); +PHP_FUNCTION(mysql_errno); +PHP_FUNCTION(mysql_affected_rows); +PHP_FUNCTION(mysql_insert_id); +PHP_FUNCTION(mysql_result); +PHP_FUNCTION(mysql_num_rows); +PHP_FUNCTION(mysql_num_fields); +PHP_FUNCTION(mysql_fetch_row); +PHP_FUNCTION(mysql_fetch_array); +PHP_FUNCTION(mysql_fetch_assoc); +PHP_FUNCTION(mysql_fetch_object); +PHP_FUNCTION(mysql_data_seek); +PHP_FUNCTION(mysql_fetch_lengths); +PHP_FUNCTION(mysql_fetch_field); +PHP_FUNCTION(mysql_field_seek); +PHP_FUNCTION(mysql_free_result); +PHP_FUNCTION(mysql_field_name); +PHP_FUNCTION(mysql_field_table); +PHP_FUNCTION(mysql_field_len); +PHP_FUNCTION(mysql_field_type); +PHP_FUNCTION(mysql_field_flags); +PHP_FUNCTION(mysql_escape_string); +PHP_FUNCTION(mysql_real_escape_string); +PHP_FUNCTION(mysql_get_client_info); +PHP_FUNCTION(mysql_get_host_info); +PHP_FUNCTION(mysql_get_proto_info); +PHP_FUNCTION(mysql_get_server_info); +PHP_FUNCTION(mysql_info); +PHP_FUNCTION(mysql_stat); +PHP_FUNCTION(mysql_thread_id); +PHP_FUNCTION(mysql_client_encoding); +PHP_FUNCTION(mysql_ping); + +ZEND_BEGIN_MODULE_GLOBALS(mysql) + long default_link; + long num_links,num_persistent; + long max_links,max_persistent; + long allow_persistent; + long default_port; + char *default_host, *default_user, *default_password; + char *default_socket; + char *connect_error; + long connect_errno; + long connect_timeout; + long result_allocated; + long trace_mode; + long allow_local_infile; +#ifdef HAVE_MYSQLND + MYSQLND_THD_ZVAL_PCACHE *mysqlnd_thd_zval_cache; + MYSQLND_QCACHE *mysqlnd_qcache; + long cache_size; +#endif +ZEND_END_MODULE_GLOBALS(mysql) + +#ifdef ZTS +# define MySG(v) TSRMG(mysql_globals_id, zend_mysql_globals *, v) +#else +# define MySG(v) (mysql_globals.v) +#endif + + +#endif /* PHP_MYSQL_STRUCTS_H */
Modified: trunk/php5/ext/mysqli/config.m4
- trunk/php5/ext/mysqli/config.m4 2007-10-15 15:45:46 UTC (rev 1102)
+++ trunk/php5/ext/mysqli/config.m4 2007-10-16 20:11:29 UTC (rev 1103)
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.28 2007/07/25 23:47:32 jani Exp $
+dnl $Id: config.m4,v 1.22.2.1.2.2.2.1 2007/10/05 21:23:56 andrey Exp $ dnl config.m4 for extension mysqli
PHP_ARG_WITH(mysqli, for MySQLi support,
Modified: trunk/php5/ext/mysqli/config.w32
- trunk/php5/ext/mysqli/config.w32 2007-10-15 15:45:46 UTC (rev 1102)
+++ trunk/php5/ext/mysqli/config.w32 2007-10-16 20:11:29 UTC (rev 1103)
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.7 2005/06/05 19:25:01 wez Exp $
+// $Id: config.w32,v 1.7.6.1 2007/10/05 21:23:56 andrey Exp $ // vim:ft=javascript
// Note: The extension name is "mysqli", you enable it with "--with-mysqli".
Modified: trunk/php5/ext/mysqli/mysqli.c
- trunk/php5/ext/mysqli/mysqli.c 2007-10-15 15:45:46 UTC (rev 1102)
+++ trunk/php5/ext/mysqli/mysqli.c 2007-10-16 20:11:29 UTC (rev 1103)
@@ -15,7 +15,7 @@
| Author: Georg Richter <georg@php.net> |
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.72.2.16.2.14 2007/02/24 02:17:25 helly Exp $ + $Id: mysqli.c,v 1.72.2.16.2.17.2.3 2007/10/07 05:22:05 davidw Exp $ */
#ifdef HAVE_CONFIG_H
@@ -352,7 +352,7 @@
ret = hnd->read_func(obj, &retval TSRMLS_CC);
if (ret == SUCCESS) {
/* ensure we're creating a temporary variable */
- retval->refcount = 0;
+ Z_SET_REFCOUNT_P(retval, 0);
} else {
retval = EG(uninitialized_zval_ptr);
}
@@ -392,8 +392,8 @@
}
if (ret == SUCCESS) {
hnd->write_func(obj, value TSRMLS_CC);
- if (! PZVAL_IS_REF(value) && value->refcount == 0) {
- value->refcount++;
+ if (! PZVAL_IS_REF(value) && Z_REFCOUNT_P(value) == 0) {
+ Z_ADDREF_P(value);
zval_ptr_dtor(&value);
}
} else {
@@ -1092,7 +1092,7 @@
}
if (fetchtype & MYSQLI_ASSOC) {
if (fetchtype & MYSQLI_NUM) {
- ZVAL_ADDREF(res);
+ Z_ADDREF_P(res);
}
add_assoc_zval(return_value, fields[i].name, res);
}
Modified: trunk/php5/ext/mysqli/mysqli_api.c
- trunk/php5/ext/mysqli/mysqli_api.c 2007-10-15 15:45:46 UTC (rev 1102)
+++ trunk/php5/ext/mysqli/mysqli_api.c 2007-10-16 20:11:29 UTC (rev 1103)
@@ -17,7 +17,7 @@
| Ulf Wendel <uw@php.net> |
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.118.2.22.2.11 2007/03/08 22:49:53 stas Exp $ + $Id: mysqli_api.c,v 1.118.2.22.2.16.2.3 2007/10/07 08:30:47 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
@@ -138,7 +138,7 @@
stmt->param.vars = (zval **)safe_emalloc(num_vars, sizeof(zval), 0);
for (i = 0; i < num_vars; i++) {
if (bind[i].buffer_type != MYSQL_TYPE_LONG_BLOB) {
- ZVAL_ADDREF(*args[i+start]);
+ Z_ADDREF_P(*args[i+start]);
stmt->param.vars[i] = *args[i+start];
} else {
stmt->param.vars[i] = NULL;
@@ -426,7 +426,7 @@
stmt->result.vars = (zval **)safe_emalloc((var_cnt), sizeof(zval), 0);
for (i = start; i < var_cnt+start; i++) {
ofs = i-start;
- ZVAL_ADDREF(*args[i]);
+ Z_ADDREF_PP(args[i]);
stmt->result.vars[ofs] = *args[i];
}
}
Modified: trunk/php5/ext/mysqli/mysqli_fe.c
- trunk/php5/ext/mysqli/mysqli_fe.c 2007-10-15 15:45:46 UTC (rev 1102)
+++ trunk/php5/ext/mysqli/mysqli_fe.c 2007-10-16 20:11:29 UTC (rev 1103)
@@ -15,7 +15,7 @@
| Author: Georg Richter <georg@php.net> |
+----------------------------------------------------------------------+
- $Id: mysqli_fe.c,v 1.49.2.5.2.1 2007/01/01 09:36:03 sebastian Exp $ + $Id: mysqli_fe.c,v 1.49.2.5.2.1.2.2 2007/10/05 21:23:56 andrey Exp $ */
#ifdef HAVE_CONFIG_H
Modified: trunk/php5/ext/mysqli/mysqli_nonapi.c
- trunk/php5/ext/mysqli/mysqli_nonapi.c 2007-10-15 15:45:46 UTC (rev 1102)
+++ trunk/php5/ext/mysqli/mysqli_nonapi.c 2007-10-16 20:11:29 UTC (rev 1103)
@@ -17,7 +17,7 @@
| Ulf Wendel <uw@php.net> |
+----------------------------------------------------------------------+
- $Id: mysqli_nonapi.c,v 1.54.2.7.2.2 2007/01/01 09:36:03 sebastian Exp $ + $Id: mysqli_nonapi.c,v 1.54.2.7.2.5.2.1 2007/10/05 21:23:56 andrey Exp $ */
#ifdef HAVE_CONFIG_H
Modified: trunk/php5/ext/mysqli/mysqli_prop.c
- trunk/php5/ext/mysqli/mysqli_prop.c 2007-10-15 15:45:46 UTC (rev 1102)
+++ trunk/php5/ext/mysqli/mysqli_prop.c 2007-10-16 20:11:29 UTC (rev 1103)
@@ -15,7 +15,7 @@
| Author: Georg Richter <georg@php.net> |
+----------------------------------------------------------------------+
- $Id: mysqli_prop.c,v 1.23.2.5.2.2 2007/02/24 02:17:25 helly Exp $ + $Id: mysqli_prop.c,v 1.23.2.5.2.2.2.1 2007/10/05 21:23:56 andrey Exp $ */
#ifdef HAVE_CONFIG_H
@@ -86,8 +86,8 @@
ZVAL_LONG(*retval, l);\
} else { \
char *ret; \
- int l = spprintf(&ret, 0, MYSQLI_LLU_SPEC, (my_ulonglong)l); \
- ZVAL_STRINGL(*retval, ret, l, 0); \
+ int ret_len = spprintf(&ret, 0, MYSQLI_LLU_SPEC, (my_ulonglong)l); \
+ ZVAL_STRINGL(*retval, ret, ret_len, 0); \
} \
}\
return SUCCESS;\
Modified: trunk/php5/ext/mysqli/mysqli_repl.c
- trunk/php5/ext/mysqli/mysqli_repl.c 2007-10-15 15:45:46 UTC (rev 1102)
+++ trunk/php5/ext/mysqli/mysqli_repl.c 2007-10-16 20:11:29 UTC (rev 1103)
@@ -15,7 +15,7 @@
| Author: Georg Richter <georg@php.net> |
+----------------------------------------------------------------------+
- $Id: mysqli_repl.c,v 1.3.2.2.2.1 2007/01/01 09:36:03 sebastian Exp $ + $Id: mysqli_repl.c,v 1.3.2.2.2.1.2.1 2007/10/05 21:23:56 andrey Exp $ */
#ifdef HAVE_CONFIG_H
Modified: trunk/php5/ext/mysqli/mysqli_report.c
- trunk/php5/ext/mysqli/mysqli_report.c 2007-10-15 15:45:46 UTC (rev 1102)
+++ trunk/php5/ext/mysqli/mysqli_report.c 2007-10-16 20:11:29 UTC (rev 1103)
@@ -15,7 +15,7 @@
| Author: Georg Richter <georg@php.net> |
+----------------------------------------------------------------------+
- $Id: mysqli_report.c,v 1.11.2.2.2.2 2007/01/01 09:36:03 sebastian Exp $ + $Id: mysqli_report.c,v 1.11.2.2.2.2.2.1 2007/10/05 21:23:56 andrey Exp $ */
#ifdef HAVE_CONFIG_H
Modified: trunk/php5/ext/mysqli/package.xml
- trunk/php5/ext/mysqli/package.xml 2007-10-15 15:45:46 UTC (rev 1102)
+++ trunk/php5/ext/mysqli/package.xml 2007-10-16 20:11:29 UTC (rev 1103)
@@ -26,7 +26,7 @@
<version>5.0.0rc1</version>
<date>2004-03-19</date>
<notes>
-package.xml added to support intallation using pear installer
+package.xml added to support installation using pear installer </notes> <configureoptions> <configureoption name="with-mysqli" default="autodetect" prompt="path to mysql_config tool?"/>
Modified: trunk/php5/ext/mysqli/php_mysqli.h
- trunk/php5/ext/mysqli/php_mysqli.h 2007-10-15 15:45:46 UTC (rev 1102)
+++ trunk/php5/ext/mysqli/php_mysqli.h 2007-10-16 20:11:29 UTC (rev 1103)
@@ -17,133 +17,12 @@
| Ulf Wendel <uw@php.net> |
+----------------------------------------------------------------------+
- $Id: php_mysqli.h,v 1.54.2.7.2.5 2007/02/24 14:33:50 helly Exp $ + $Id: php_mysqli.h,v 1.54.2.7.2.6.2.3 2007/10/08 15:38:47 andrey Exp $ */
#ifndef PHP_MYSQLI_H
#define PHP_MYSQLI_H
-
-PHP_MINIT_FUNCTION(mysqli);
-PHP_MSHUTDOWN_FUNCTION(mysqli);
-PHP_RINIT_FUNCTION(mysqli);
-PHP_RSHUTDOWN_FUNCTION(mysqli);
-PHP_MINFO_FUNCTION(mysqli);
-
-PHP_FUNCTION(mysqli);
-PHP_FUNCTION(mysqli_affected_rows);
-PHP_FUNCTION(mysqli_autocommit);
-PHP_FUNCTION(mysqli_change_user);
-PHP_FUNCTION(mysqli_character_set_name);
-PHP_FUNCTION(mysqli_set_charset);
-PHP_FUNCTION(mysqli_close);
-PHP_FUNCTION(mysqli_commit);
-PHP_FUNCTION(mysqli_connect);
-PHP_FUNCTION(mysqli_connect_errno);
-PHP_FUNCTION(mysqli_connect_error);
-PHP_FUNCTION(mysqli_data_seek);
-PHP_FUNCTION(mysqli_debug);
-PHP_FUNCTION(mysqli_disable_reads_from_master);
-PHP_FUNCTION(mysqli_disable_rpl_parse);
-PHP_FUNCTION(mysqli_dump_debug_info);
-PHP_FUNCTION(mysqli_enable_reads_from_master);
-PHP_FUNCTION(mysqli_enable_rpl_parse);
-PHP_FUNCTION(mysqli_errno);
-PHP_FUNCTION(mysqli_error);
-PHP_FUNCTION(mysqli_fetch_all);
-PHP_FUNCTION(mysqli_fetch_array);
-PHP_FUNCTION(mysqli_fetch_assoc);
-PHP_FUNCTION(mysqli_fetch_object);
-PHP_FUNCTION(mysqli_fetch_field);
-PHP_FUNCTION(mysqli_fetch_fields);
-PHP_FUNCTION(mysqli_fetch_field_direct);
-PHP_FUNCTION(mysqli_fetch_lengths);
-PHP_FUNCTION(mysqli_fetch_row);
-PHP_FUNCTION(mysqli_field_count);
-PHP_FUNCTION(mysqli_field_seek);
-PHP_FUNCTION(mysqli_field_tell);
-PHP_FUNCTION(mysqli_free_result);
-PHP_FUNCTION(mysqli_get_cache_stats);
-PHP_FUNCTION(mysqli_get_client_stats);
-PHP_FUNCTION(mysqli_get_connection_stats);
-PHP_FUNCTION(mysqli_get_charset);
-PHP_FUNCTION(mysqli_get_client_info);
-PHP_FUNCTION(mysqli_get_client_version);
-PHP_FUNCTION(mysqli_get_host_info);
-PHP_FUNCTION(mysqli_get_proto_info);
-PHP_FUNCTION(mysqli_get_server_info);
-PHP_FUNCTION(mysqli_get_server_version);
-PHP_FUNCTION(mysqli_get_warnings);
-PHP_FUNCTION(mysqli_info);
-PHP_FUNCTION(mysqli_insert_id);
-PHP_FUNCTION(mysqli_init);
-PHP_FUNCTION(mysqli_kill);
-PHP_FUNCTION(mysqli_set_local_infile_default);
-PHP_FUNCTION(mysqli_set_local_infile_handler);
-PHP_FUNCTION(mysqli_master_query);
-PHP_FUNCTION(mysqli_more_results);
-PHP_FUNCTION(mysqli_multi_query);
-PHP_FUNCTION(mysqli_next_result);
-PHP_FUNCTION(mysqli_num_fields);
-PHP_FUNCTION(mysqli_num_rows);
-PHP_FUNCTION(mysqli_options);
-PHP_FUNCTION(mysqli_ping);
-PHP_FUNCTION(mysqli_prepare);
-PHP_FUNCTION(mysqli_query);
-PHP_FUNCTION(mysqli_stmt_result_metadata);
-PHP_FUNCTION(mysqli_report);
-PHP_FUNCTION(mysqli_read_query_result);
-PHP_FUNCTION(mysqli_real_connect);
-PHP_FUNCTION(mysqli_real_query);
-PHP_FUNCTION(mysqli_real_escape_string);
-PHP_FUNCTION(mysqli_rollback);
-PHP_FUNCTION(mysqli_row_seek);
-PHP_FUNCTION(mysqli_rpl_parse_enabled);
-PHP_FUNCTION(mysqli_rpl_probe);
-PHP_FUNCTION(mysqli_rpl_query_type);
-PHP_FUNCTION(mysqli_select_db);
-PHP_FUNCTION(mysqli_stmt_attr_get);
-PHP_FUNCTION(mysqli_stmt_attr_set);
-PHP_FUNCTION(mysqli_stmt_bind_param);
-PHP_FUNCTION(mysqli_stmt_bind_result);
-PHP_FUNCTION(mysqli_stmt_execute);
-PHP_FUNCTION(mysqli_stmt_field_count);
-PHP_FUNCTION(mysqli_stmt_init);
-PHP_FUNCTION(mysqli_stmt_prepare);
-PHP_FUNCTION(mysqli_stmt_fetch);
-PHP_FUNCTION(mysqli_stmt_param_count);
-PHP_FUNCTION(mysqli_stmt_send_long_data);
-PHP_FUNCTION(mysqli_send_query);
-PHP_FUNCTION(mysqli_embedded_server_end);
-PHP_FUNCTION(mysqli_embedded_server_start);
-PHP_FUNCTION(mysqli_slave_query);
-PHP_FUNCTION(mysqli_sqlstate);
-PHP_FUNCTION(mysqli_ssl_set);
-PHP_FUNCTION(mysqli_stat);
-PHP_FUNCTION(mysqli_stmt_affected_rows);
-PHP_FUNCTION(mysqli_stmt_close);
-PHP_FUNCTION(mysqli_stmt_data_seek);
-PHP_FUNCTION(mysqli_stmt_errno);
-PHP_FUNCTION(mysqli_stmt_error);
-PHP_FUNCTION(mysqli_stmt_free_result);
-PHP_FUNCTION(mysqli_stmt_get_result);
-PHP_FUNCTION(mysqli_stmt_get_warnings);
-PHP_FUNCTION(mysqli_stmt_reset);
-PHP_FUNCTION(mysqli_stmt_insert_id);
-PHP_FUNCTION(mysqli_stmt_num_rows);
-PHP_FUNCTION(mysqli_stmt_sqlstate);
-PHP_FUNCTION(mysqli_stmt_store_result);
-PHP_FUNCTION(mysqli_store_result);
-PHP_FUNCTION(mysqli_thread_id);
-PHP_FUNCTION(mysqli_thread_safe);
-PHP_FUNCTION(mysqli_use_result);
-PHP_FUNCTION(mysqli_warning_count);
-
-ZEND_FUNCTION(mysqli_stmt_construct);
-ZEND_FUNCTION(mysqli_result_construct);
-ZEND_FUNCTION(mysqli_driver_construct);
-ZEND_METHOD(mysqli_warning,__construct);
-
#define phpext_mysqli_ptr &mysqli_module_entry
extern zend_module_entry mysqli_module_entry;
Modified: trunk/php5/ext/mysqli/php_mysqli_structs.h
- trunk/php5/ext/mysqli/php_mysqli_structs.h 2007-10-15 15:45:46 UTC (rev 1102)
+++ trunk/php5/ext/mysqli/php_mysqli_structs.h 2007-10-16 20:11:29 UTC (rev 1103)
@@ -15,7 +15,7 @@
| Author: Georg Richter <georg@php.net> |
+----------------------------------------------------------------------+
- $Id: php_mysqli.h,v 1.54.2.7.2.5 2007/02/24 14:33:50 helly Exp $ + $Id: php_mysqli_structs.h,v 1.4.2.3 2007/10/08 15:38:47 andrey Exp $ */
#ifndef PHP_MYSQLI_STRUCTS_H
@@ -382,6 +382,127 @@
ZEND_EXTERN_MODULE_GLOBALS(mysqli)
+ +PHP_MINIT_FUNCTION(mysqli); +PHP_MSHUTDOWN_FUNCTION(mysqli); +PHP_RINIT_FUNCTION(mysqli); +PHP_RSHUTDOWN_FUNCTION(mysqli); +PHP_MINFO_FUNCTION(mysqli); + +PHP_FUNCTION(mysqli); +PHP_FUNCTION(mysqli_affected_rows); +PHP_FUNCTION(mysqli_autocommit); +PHP_FUNCTION(mysqli_change_user); +PHP_FUNCTION(mysqli_character_set_name); +PHP_FUNCTION(mysqli_set_charset); +PHP_FUNCTION(mysqli_close); +PHP_FUNCTION(mysqli_commit); +PHP_FUNCTION(mysqli_connect); +PHP_FUNCTION(mysqli_connect_errno); +PHP_FUNCTION(mysqli_connect_error); +PHP_FUNCTION(mysqli_data_seek); +PHP_FUNCTION(mysqli_debug); +PHP_FUNCTION(mysqli_disable_reads_from_master); +PHP_FUNCTION(mysqli_disable_rpl_parse); +PHP_FUNCTION(mysqli_dump_debug_info); +PHP_FUNCTION(mysqli_enable_reads_from_master); +PHP_FUNCTION(mysqli_enable_rpl_parse); +PHP_FUNCTION(mysqli_errno); +PHP_FUNCTION(mysqli_error); +PHP_FUNCTION(mysqli_fetch_all); +PHP_FUNCTION(mysqli_fetch_array); +PHP_FUNCTION(mysqli_fetch_assoc); +PHP_FUNCTION(mysqli_fetch_object); +PHP_FUNCTION(mysqli_fetch_field); +PHP_FUNCTION(mysqli_fetch_fields); +PHP_FUNCTION(mysqli_fetch_field_direct); +PHP_FUNCTION(mysqli_fetch_lengths); +PHP_FUNCTION(mysqli_fetch_row); +PHP_FUNCTION(mysqli_field_count); +PHP_FUNCTION(mysqli_field_seek); +PHP_FUNCTION(mysqli_field_tell); +PHP_FUNCTION(mysqli_free_result); +PHP_FUNCTION(mysqli_get_cache_stats); +PHP_FUNCTION(mysqli_get_client_stats); +PHP_FUNCTION(mysqli_get_connection_stats); +PHP_FUNCTION(mysqli_get_charset); +PHP_FUNCTION(mysqli_get_client_info); +PHP_FUNCTION(mysqli_get_client_version); +PHP_FUNCTION(mysqli_get_host_info); +PHP_FUNCTION(mysqli_get_proto_info); +PHP_FUNCTION(mysqli_get_server_info); +PHP_FUNCTION(mysqli_get_server_version); +PHP_FUNCTION(mysqli_get_warnings); +PHP_FUNCTION(mysqli_info); +PHP_FUNCTION(mysqli_insert_id); +PHP_FUNCTION(mysqli_init); +PHP_FUNCTION(mysqli_kill); +PHP_FUNCTION(mysqli_set_local_infile_default); +PHP_FUNCTION(mysqli_set_local_infile_handler); +PHP_FUNCTION(mysqli_master_query); +PHP_FUNCTION(mysqli_more_results); +PHP_FUNCTION(mysqli_multi_query); +PHP_FUNCTION(mysqli_next_result); +PHP_FUNCTION(mysqli_num_fields); +PHP_FUNCTION(mysqli_num_rows); +PHP_FUNCTION(mysqli_options); +PHP_FUNCTION(mysqli_ping); +PHP_FUNCTION(mysqli_prepare); +PHP_FUNCTION(mysqli_query); +PHP_FUNCTION(mysqli_stmt_result_metadata); +PHP_FUNCTION(mysqli_report); +PHP_FUNCTION(mysqli_read_query_result); +PHP_FUNCTION(mysqli_real_connect); +PHP_FUNCTION(mysqli_real_query); +PHP_FUNCTION(mysqli_real_escape_string); +PHP_FUNCTION(mysqli_rollback); +PHP_FUNCTION(mysqli_row_seek); +PHP_FUNCTION(mysqli_rpl_parse_enabled); +PHP_FUNCTION(mysqli_rpl_probe); +PHP_FUNCTION(mysqli_rpl_query_type); +PHP_FUNCTION(mysqli_select_db); +PHP_FUNCTION(mysqli_stmt_attr_get); +PHP_FUNCTION(mysqli_stmt_attr_set); +PHP_FUNCTION(mysqli_stmt_bind_param); +PHP_FUNCTION(mysqli_stmt_bind_result); +PHP_FUNCTION(mysqli_stmt_execute); +PHP_FUNCTION(mysqli_stmt_field_count); +PHP_FUNCTION(mysqli_stmt_init); +PHP_FUNCTION(mysqli_stmt_prepare); +PHP_FUNCTION(mysqli_stmt_fetch); +PHP_FUNCTION(mysqli_stmt_param_count); +PHP_FUNCTION(mysqli_stmt_send_long_data); +PHP_FUNCTION(mysqli_send_query); +PHP_FUNCTION(mysqli_embedded_server_end); +PHP_FUNCTION(mysqli_embedded_server_start); +PHP_FUNCTION(mysqli_slave_query); +PHP_FUNCTION(mysqli_sqlstate); +PHP_FUNCTION(mysqli_ssl_set); +PHP_FUNCTION(mysqli_stat); +PHP_FUNCTION(mysqli_stmt_affected_rows); +PHP_FUNCTION(mysqli_stmt_close); +PHP_FUNCTION(mysqli_stmt_data_seek); +PHP_FUNCTION(mysqli_stmt_errno); +PHP_FUNCTION(mysqli_stmt_error); +PHP_FUNCTION(mysqli_stmt_free_result); +PHP_FUNCTION(mysqli_stmt_get_result); +PHP_FUNCTION(mysqli_stmt_get_warnings); +PHP_FUNCTION(mysqli_stmt_reset); +PHP_FUNCTION(mysqli_stmt_insert_id); +PHP_FUNCTION(mysqli_stmt_num_rows); +PHP_FUNCTION(mysqli_stmt_sqlstate); +PHP_FUNCTION(mysqli_stmt_store_result); +PHP_FUNCTION(mysqli_store_result); +PHP_FUNCTION(mysqli_thread_id); +PHP_FUNCTION(mysqli_thread_safe); +PHP_FUNCTION(mysqli_use_result); +PHP_FUNCTION(mysqli_warning_count); + +ZEND_FUNCTION(mysqli_stmt_construct); +ZEND_FUNCTION(mysqli_result_construct); +ZEND_FUNCTION(mysqli_driver_construct); +ZEND_METHOD(mysqli_warning,__construct); + #endif /* PHP_MYSQLI_STRUCTS.H */
Modified: trunk/php6/ext/mysql/config.w32
- trunk/php6/ext/mysql/config.w32 2007-10-15 15:45:46 UTC (rev 1102) +++ trunk/php6/ext/mysql/config.w32 2007-10-16 20:11:29 UTC (rev 1103) @@ -4,17 +4,16 @@ ARG_WITH("mysql", "MySQL support", "no");
if (PHP_MYSQL != "no") {
- if (PHP_MYSQLI != "mysqlnd") {
- if (CHECK_LIB("libmysql.lib", "mysql", PHP_MYSQL) &&
- CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQL",
- PHP_MYSQL + "\\include;" + PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQL)) {
- } else {
- WARNING("mysql not enabled; libraries and headers not found");
- }
- } else {
- AC_DEFINE('HAVE_MYSQLND', 1, 'MySQL native driver support enabled');
- ADD_EXTENSION_DEP('mysql', 'mysqlnd', true);
- }
- EXTENSION("mysql", "php_mysql.c");
- AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library'); + if (PHP_MYSQLI != "mysqlnd") { + if (CHECK_LIB("libmysql.lib", "mysql", PHP_MYSQL) && + CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQL", + PHP_MYSQL + "\\include;" + PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQL)) { + } else { + WARNING("mysql not enabled; libraries and headers not found"); + } + } else { + ADD_EXTENSION_DEP('mysql', 'mysqlnd', true); + } + EXTENSION("mysql", "php_mysql.c"); + AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library'); }
Modified: trunk/php6/ext/mysql/php_mysql.c
- trunk/php6/ext/mysql/php_mysql.c 2007-10-15 15:45:46 UTC (rev 1102) +++ trunk/php6/ext/mysql/php_mysql.c 2007-10-16 20:11:29 UTC (rev 1103) @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */
-/* $Id: php_mysql.c,v 1.238 2007/06/25 20:19:30 scottmac Exp $ */
+/* $Id: php_mysql.c,v 1.245 2007/10/12 07:23:44 tony2001 Exp $ */
/* TODO:
*
@@ -59,7 +59,7 @@
#endif
#include "php_ini.h"
-#include "php_mysql.h"
+#include "php_mysql_structs.h"
/* True globals, no need for thread safety */ static int le_result, le_link, le_plink; @@ -2093,7 +2093,7 @@
}
if (result_type & MYSQL_ASSOC) {
if (result_type & MYSQL_NUM) {
- ZVAL_ADDREF(data);
+ Z_ADDREF_P(data);
}
if (UG(unicode)) {
UChar *ustr;
Modified: trunk/php6/ext/mysql/php_mysql.h
- trunk/php6/ext/mysql/php_mysql.h 2007-10-15 15:45:46 UTC (rev 1102) +++ trunk/php6/ext/mysql/php_mysql.h 2007-10-16 20:11:29 UTC (rev 1103) @@ -16,134 +16,18 @@ +----------------------------------------------------------------------+ */
+/* $Id: php_mysql.h,v 1.42 2007/07/25 23:47:32 jani Exp $ */
-/* $Id: php_mysql.h,v 1.40 2007/05/14 17:11:50 scottmac Exp $ */
-
#ifndef PHP_MYSQL_H
#define PHP_MYSQL_H
-#ifdef PHP_WIN32
-#define PHP_MYSQL_API __declspec(dllexport)
-#else
-#define PHP_MYSQL_API
-#endif
-
#if HAVE_MYSQL
-#ifdef ZTS
-#include "TSRM.h"
-#endif
-
-#ifndef TRUE
-#define TRUE 1
-#endif
-
-#ifndef FALSE
-#define FALSE 0
-#endif
-
-#if defined(HAVE_MYSQLND)
-#include "ext/mysqlnd/mysqlnd.h"
-#include "ext/mysql/mysql_mysqlnd.h"
-#else
-#include <mysql.h>
-#endif
-
-#if (MYSQL_VERSION_ID >= 40113 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50007 || HAVE_MYSQLND
-#define MYSQL_HAS_SET_CHARSET
-#endif
-
extern zend_module_entry mysql_module_entry;
-
#define mysql_module_ptr &mysql_module_entry
-PHP_MINIT_FUNCTION(mysql);
-PHP_RINIT_FUNCTION(mysql);
-PHP_MSHUTDOWN_FUNCTION(mysql);
-PHP_RSHUTDOWN_FUNCTION(mysql);
-PHP_MINFO_FUNCTION(mysql);
-
-PHP_FUNCTION(mysql_connect);
-PHP_FUNCTION(mysql_pconnect);
-PHP_FUNCTION(mysql_close);
-PHP_FUNCTION(mysql_select_db);
-#if MYSQL_VERSION_ID < 40000
-PHP_FUNCTION(mysql_create_db);
-PHP_FUNCTION(mysql_drop_db);
-#endif
-PHP_FUNCTION(mysql_query);
-PHP_FUNCTION(mysql_unbuffered_query);
-PHP_FUNCTION(mysql_db_query);
-PHP_FUNCTION(mysql_list_dbs);
-PHP_FUNCTION(mysql_list_tables);
-PHP_FUNCTION(mysql_list_fields);
-PHP_FUNCTION(mysql_list_processes);
-PHP_FUNCTION(mysql_error);
-PHP_FUNCTION(mysql_errno);
-PHP_FUNCTION(mysql_affected_rows);
-PHP_FUNCTION(mysql_insert_id);
-PHP_FUNCTION(mysql_result);
-PHP_FUNCTION(mysql_num_rows);
-PHP_FUNCTION(mysql_num_fields);
-PHP_FUNCTION(mysql_fetch_row);
-PHP_FUNCTION(mysql_fetch_array);
-PHP_FUNCTION(mysql_fetch_assoc);
-PHP_FUNCTION(mysql_fetch_object);
-PHP_FUNCTION(mysql_data_seek);
-PHP_FUNCTION(mysql_fetch_lengths);
-PHP_FUNCTION(mysql_fetch_field);
-PHP_FUNCTION(mysql_field_seek);
-PHP_FUNCTION(mysql_free_result);
-PHP_FUNCTION(mysql_field_name);
-PHP_FUNCTION(mysql_field_table);
-PHP_FUNCTION(mysql_field_len);
-PHP_FUNCTION(mysql_field_type);
-PHP_FUNCTION(mysql_field_flags);
-PHP_FUNCTION(mysql_escape_string);
-PHP_FUNCTION(mysql_real_escape_string);
-PHP_FUNCTION(mysql_get_client_info);
-PHP_FUNCTION(mysql_get_host_info);
-PHP_FUNCTION(mysql_get_proto_info);
-PHP_FUNCTION(mysql_get_server_info);
-PHP_FUNCTION(mysql_info);
-PHP_FUNCTION(mysql_stat);
-PHP_FUNCTION(mysql_thread_id);
-PHP_FUNCTION(mysql_client_encoding);
-PHP_FUNCTION(mysql_ping);
-PHP_FUNCTION(mysql_set_charset);
-
-ZEND_BEGIN_MODULE_GLOBALS(mysql)
- long default_link;
- long num_links,num_persistent;
- long max_links,max_persistent;
- long allow_persistent;
- long default_port;
- char *default_host, *default_user, *default_password;
- char *default_socket;
- char *connect_error;
- long connect_errno;
- long connect_timeout;
- long result_allocated;
- long trace_mode;
- long allow_local_infile;
-#ifdef HAVE_MYSQLND - MYSQLND_THD_ZVAL_PCACHE *mysqlnd_thd_zval_cache;
- MYSQLND_QCACHE *mysqlnd_qcache;
- long cache_size;
-#endif
-ZEND_END_MODULE_GLOBALS(mysql)
-
-#ifdef ZTS
-# define MySG(v) TSRMG(mysql_globals_id, zend_mysql_globals *, v)
#else
-# define MySG(v) (mysql_globals.v)
-#endif
-
-
-#else
-
#define mysql_module_ptr NULL
-
#endif
#define phpext_mysql_ptr mysql_module_ptr
Added: trunk/php6/ext/mysql/php_mysql_structs.h
- trunk/php6/ext/mysql/php_mysql_structs.h 2007-10-15 15:45:46 UTC (rev 1102) +++ trunk/php6/ext/mysql/php_mysql_structs.h 2007-10-16 20:11:29 UTC (rev 1103) @@ -0,0 +1,151 @@ +/* + +----------------------------------------------------------------------+ + | PHP Version 5 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997-2007 The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.01 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available through the world-wide-web at the following url: | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Author: Zeev Suraski <zeev@zend.com> | + | Andrey Hristov <andrey@php.net> | + +----------------------------------------------------------------------+ +*/ + +/* $Id: php_mysql.h,v 1.42 2007/07/25 23:47:32 jani Exp $ */ + +#ifndef PHP_MYSQL_STRUCTS_H +#define PHP_MYSQL_STRUCTS_H + +#ifdef PHP_WIN32 +#define PHP_MYSQL_API __declspec(dllexport) +#else +#define PHP_MYSQL_API +#endif + +#if HAVE_MYSQL + +#ifdef ZTS +#include "TSRM.h" +#endif + +#ifndef TRUE +#define TRUE 1 +#endif + +#ifndef FALSE +#define FALSE 0 +#endif + +#if defined(HAVE_MYSQLND) +#include "ext/mysqlnd/mysqlnd.h" +#include "ext/mysql/mysql_mysqlnd.h" +#else +#include <mysql.h> +#endif + +#if (MYSQL_VERSION_ID >= 40113 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50007 || HAVE_MYSQLND +#define MYSQL_HAS_SET_CHARSET +#endif + +extern zend_module_entry mysql_module_entry; + +#define mysql_module_ptr &mysql_module_entry + +PHP_MINIT_FUNCTION(mysql); +PHP_RINIT_FUNCTION(mysql); +PHP_MSHUTDOWN_FUNCTION(mysql); +PHP_RSHUTDOWN_FUNCTION(mysql); +PHP_MINFO_FUNCTION(mysql); + +PHP_FUNCTION(mysql_connect); +PHP_FUNCTION(mysql_pconnect); +PHP_FUNCTION(mysql_close); +PHP_FUNCTION(mysql_select_db); +#if MYSQL_VERSION_ID < 40000 +PHP_FUNCTION(mysql_create_db); +PHP_FUNCTION(mysql_drop_db); +#endif +PHP_FUNCTION(mysql_query); +PHP_FUNCTION(mysql_unbuffered_query); +PHP_FUNCTION(mysql_db_query); +PHP_FUNCTION(mysql_list_dbs); +PHP_FUNCTION(mysql_list_tables); +PHP_FUNCTION(mysql_list_fields); +PHP_FUNCTION(mysql_list_processes); +PHP_FUNCTION(mysql_error); +PHP_FUNCTION(mysql_errno); +PHP_FUNCTION(mysql_affected_rows); +PHP_FUNCTION(mysql_insert_id); +PHP_FUNCTION(mysql_result); +PHP_FUNCTION(mysql_num_rows); +PHP_FUNCTION(mysql_num_fields); +PHP_FUNCTION(mysql_fetch_row); +PHP_FUNCTION(mysql_fetch_array); +PHP_FUNCTION(mysql_fetch_assoc); +PHP_FUNCTION(mysql_fetch_object); +PHP_FUNCTION(mysql_data_seek); +PHP_FUNCTION(mysql_fetch_lengths); +PHP_FUNCTION(mysql_fetch_field); +PHP_FUNCTION(mysql_field_seek); +PHP_FUNCTION(mysql_free_result); +PHP_FUNCTION(mysql_field_name); +PHP_FUNCTION(mysql_field_table); +PHP_FUNCTION(mysql_field_len); +PHP_FUNCTION(mysql_field_type); +PHP_FUNCTION(mysql_field_flags); +PHP_FUNCTION(mysql_escape_string); +PHP_FUNCTION(mysql_real_escape_string); +PHP_FUNCTION(mysql_get_client_info); +PHP_FUNCTION(mysql_get_host_info); +PHP_FUNCTION(mysql_get_proto_info); +PHP_FUNCTION(mysql_get_server_info); +PHP_FUNCTION(mysql_info); +PHP_FUNCTION(mysql_stat); +PHP_FUNCTION(mysql_thread_id); +PHP_FUNCTION(mysql_client_encoding); +PHP_FUNCTION(mysql_ping); +PHP_FUNCTION(mysql_set_charset); + +ZEND_BEGIN_MODULE_GLOBALS(mysql) + long default_link; + long num_links,num_persistent; + long max_links,max_persistent; + long allow_persistent; + long default_port; + char *default_host, *default_user, *default_password; + char *default_socket; + char *connect_error; + long connect_errno; + long connect_timeout; + long result_allocated; + long trace_mode; + long allow_local_infile; +#ifdef HAVE_MYSQLND + MYSQLND_THD_ZVAL_PCACHE *mysqlnd_thd_zval_cache; + MYSQLND_QCACHE *mysqlnd_qcache; + long cache_size; +#endif +ZEND_END_MODULE_GLOBALS(mysql) + +#ifdef ZTS +# define MySG(v) TSRMG(mysql_globals_id, zend_mysql_globals *, v) +#else +# define MySG(v) (mysql_globals.v) +#endif + + +#else + +#define mysql_module_ptr NULL + +#endif + +#define phpext_mysql_ptr mysql_module_ptr + +#endif /* PHP_MYSQL_STRUCTS_H */
Modified: trunk/php6/ext/mysqli/config.w32
- trunk/php6/ext/mysqli/config.w32 2007-10-15 15:45:46 UTC (rev 1102)
+++ trunk/php6/ext/mysqli/config.w32 2007-10-16 20:11:29 UTC (rev 1103)
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.7 2005/06/05 19:25:01 wez Exp $
+// $Id: config.w32,v 1.9 2007/07/25 23:47:32 jani Exp $ // vim:ft=javascript
// Note: The extension name is "mysqli", you enable it w