andrey Thu Nov 20 17:21:36 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqlnd mysqlnd.c mysqlnd.h mysqlnd_debug.h
mysqlnd_palloc.c mysqlnd_ps.c
mysqlnd_structs.h
Log:
MFH:
Windows fixes for mysqlnd
Less warnings + PHPAPI for mysqlnd_poll
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.c?r1=1.5.2.34&r2=1.5.2.35&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.c
diff -u php-src/ext/mysqlnd/mysqlnd.c:1.5.2.34
php-src/ext/mysqlnd/mysqlnd.c:1.5.2.35
--- php-src/ext/mysqlnd/mysqlnd.c:1.5.2.34 Wed Nov 19 17:45:43 2008
+++ php-src/ext/mysqlnd/mysqlnd.c Thu Nov 20 17:21:36 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd.c,v 1.5.2.34 2008/11/19 17:45:43 andrey Exp $ */
+/* $Id: mysqlnd.c,v 1.5.2.35 2008/11/20 17:21:36 andrey Exp $ */
#include "php.h"
#include "mysqlnd.h"
#include "mysqlnd_wireprotocol.h"
@@ -1003,7 +1003,7 @@
#endif
/* {{{ _mysqlnd_poll */
-enum_func_status
+PHPAPI enum_func_status
_mysqlnd_poll(MYSQLND **r_array, MYSQLND **e_array, MYSQLND ***dont_poll, long
sec, long usec, uint * desc_num TSRMLS_DC)
{
@@ -1382,7 +1382,7 @@
/* {{{ mysqlnd_conn::refresh */
static enum_func_status
-MYSQLND_METHOD(mysqlnd_conn, refresh)(MYSQLND * const conn, unsigned long
options TSRMLS_DC)
+MYSQLND_METHOD(mysqlnd_conn, refresh)(MYSQLND * const conn, uint8_t options
TSRMLS_DC)
{
zend_uchar bits[1];
DBG_ENTER("mysqlnd_conn::refresh");
@@ -1397,7 +1397,7 @@
/* {{{ mysqlnd_conn::shutdown */
static enum_func_status
-MYSQLND_METHOD(mysqlnd_conn, shutdown)(MYSQLND * const conn, unsigned long
level TSRMLS_DC)
+MYSQLND_METHOD(mysqlnd_conn, shutdown)(MYSQLND * const conn, uint8_t level
TSRMLS_DC)
{
zend_uchar bits[1];
DBG_ENTER("mysqlnd_conn::shutdown");
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.h?r1=1.3.2.19&r2=1.3.2.20&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.h
diff -u php-src/ext/mysqlnd/mysqlnd.h:1.3.2.19
php-src/ext/mysqlnd/mysqlnd.h:1.3.2.20
--- php-src/ext/mysqlnd/mysqlnd.h:1.3.2.19 Tue Nov 18 17:02:18 2008
+++ php-src/ext/mysqlnd/mysqlnd.h Thu Nov 20 17:21:36 2008
@@ -18,12 +18,12 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd.h,v 1.3.2.19 2008/11/18 17:02:18 andrey Exp $ */
+/* $Id: mysqlnd.h,v 1.3.2.20 2008/11/20 17:21:36 andrey Exp $ */
#ifndef MYSQLND_H
#define MYSQLND_H
-#define MYSQLND_VERSION "mysqlnd 5.0.5-dev - 081106 - $Revision: 1.3.2.19 $"
+#define MYSQLND_VERSION "mysqlnd 5.0.5-dev - 081106 - $Revision: 1.3.2.20 $"
#define MYSQLND_VERSION_ID 50005
/* This forces inlining of some accessor functions */
@@ -111,7 +111,7 @@
#define mysqlnd_reap_async_query(conn)
(conn)->m->reap_query((conn) TSRMLS_CC)
#define mysqlnd_unbuffered_skip_result(result)
(result)->m.skip_result((result) TSRMLS_CC)
-enum_func_status _mysqlnd_poll(MYSQLND **r_array, MYSQLND **e_array, MYSQLND
***dont_poll, long sec, long usec, uint * desc_num TSRMLS_DC);
+PHPAPI enum_func_status _mysqlnd_poll(MYSQLND **r_array, MYSQLND **e_array,
MYSQLND ***dont_poll, long sec, long usec, uint * desc_num TSRMLS_DC);
#define mysqlnd_use_result(conn) (conn)->m->use_result((conn)
TSRMLS_CC)
#define mysqlnd_store_result(conn) (conn)->m->store_result((conn)
TSRMLS_CC)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_debug.h?r1=1.1.2.9&r2=1.1.2.10&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_debug.h
diff -u php-src/ext/mysqlnd/mysqlnd_debug.h:1.1.2.9
php-src/ext/mysqlnd/mysqlnd_debug.h:1.1.2.10
--- php-src/ext/mysqlnd/mysqlnd_debug.h:1.1.2.9 Thu Nov 6 10:37:47 2008
+++ php-src/ext/mysqlnd/mysqlnd_debug.h Thu Nov 20 17:21:36 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_debug.h,v 1.1.2.9 2008/11/06 10:37:47 andrey Exp $ */
+/* $Id: mysqlnd_debug.h,v 1.1.2.10 2008/11/20 17:21:36 andrey Exp $ */
#ifndef MYSQLND_DEBUG_H
#define MYSQLND_DEBUG_H
@@ -92,13 +92,13 @@
#elif MYSQLND_DBG_ENABLED == 0
-static inline void DBG_INF(char *msg) {}
-static inline void DBG_ERR(char *msg) {}
-static inline void DBG_INF_FMT(char *format, ...) {}
-static inline void DBG_ERR_FMT(char *format, ...) {}
-static inline void DBG_ENTER(char *func_name) {}
+static inline void DBG_INF(const char * const msg) {}
+static inline void DBG_ERR(const char * const msg) {}
+static inline void DBG_INF_FMT(const char * const format, ...) {}
+static inline void DBG_ERR_FMT(const char * const format, ...) {}
+static inline void DBG_ENTER(const char * const func_name) {}
#define DBG_RETURN(value) return (value)
-#define DBG_VOID_RETURN return;
+#define DBG_VOID_RETURN return
#endif
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_palloc.c?r1=1.2.2.12&r2=1.2.2.13&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_palloc.c
diff -u php-src/ext/mysqlnd/mysqlnd_palloc.c:1.2.2.12
php-src/ext/mysqlnd/mysqlnd_palloc.c:1.2.2.13
--- php-src/ext/mysqlnd/mysqlnd_palloc.c:1.2.2.12 Tue Jul 15 13:11:09 2008
+++ php-src/ext/mysqlnd/mysqlnd_palloc.c Thu Nov 20 17:21:36 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_palloc.c,v 1.2.2.12 2008/07/15 13:11:09 andrey Exp $ */
+/* $Id: mysqlnd_palloc.c,v 1.2.2.13 2008/11/20 17:21:36 andrey Exp $ */
#include "php.h"
#include "mysqlnd.h"
#include "mysqlnd_priv.h"
@@ -492,7 +492,7 @@
thd_cache->gc_list.last_added,
*thd_cache->gc_list.last_added,
cache->free_list.canary1,
cache->free_list.canary2);
- if ((thd_cache->gc_list.last_added -
thd_cache->gc_list.ptr_line) > cache->max_items) {
+ if ((thd_cache->gc_list.last_added -
thd_cache->gc_list.ptr_line) > (int) cache->max_items) {
DBG_ERR("Buffer overflow follows");
DBG_ERR_FMT("parent->max_items=%d parent->free_items=%d
diff=%d",
cache->max_items,
cache->free_items,
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_ps.c?r1=1.3.2.21&r2=1.3.2.22&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_ps.c
diff -u php-src/ext/mysqlnd/mysqlnd_ps.c:1.3.2.21
php-src/ext/mysqlnd/mysqlnd_ps.c:1.3.2.22
--- php-src/ext/mysqlnd/mysqlnd_ps.c:1.3.2.21 Thu Nov 6 10:37:47 2008
+++ php-src/ext/mysqlnd/mysqlnd_ps.c Thu Nov 20 17:21:36 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_ps.c,v 1.3.2.21 2008/11/06 10:37:47 andrey Exp $ */
+/* $Id: mysqlnd_ps.c,v 1.3.2.22 2008/11/20 17:21:36 andrey Exp $ */
#include "php.h"
#include "mysqlnd.h"
#include "mysqlnd_wireprotocol.h"
@@ -866,7 +866,7 @@
|| Z_TYPE_P(data) ==
IS_UNICODE
#endif
)
- &&
(result->meta->fields[i].max_length < Z_STRLEN_P(data)))
+ &&
(result->meta->fields[i].max_length < (unsigned long) Z_STRLEN_P(data)))
{
result->meta->fields[i].max_length = Z_STRLEN_P(data);
}
@@ -1034,7 +1034,7 @@
|| Z_TYPE_P(data) ==
IS_UNICODE
#endif
)
- &&
(result->meta->fields[i].max_length < Z_STRLEN_P(data)))
+ &&
(result->meta->fields[i].max_length < (unsigned long) Z_STRLEN_P(data)))
{
result->meta->fields[i].max_length = Z_STRLEN_P(data);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_structs.h?r1=1.2.2.17&r2=1.2.2.18&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_structs.h
diff -u php-src/ext/mysqlnd/mysqlnd_structs.h:1.2.2.17
php-src/ext/mysqlnd/mysqlnd_structs.h:1.2.2.18
--- php-src/ext/mysqlnd/mysqlnd_structs.h:1.2.2.17 Tue Nov 18 17:02:18 2008
+++ php-src/ext/mysqlnd/mysqlnd_structs.h Thu Nov 20 17:21:36 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_structs.h,v 1.2.2.17 2008/11/18 17:02:18 andrey Exp $ */
+/* $Id: mysqlnd_structs.h,v 1.2.2.18 2008/11/20 17:21:36 andrey Exp $ */
#ifndef MYSQLND_STRUCTS_H
#define MYSQLND_STRUCTS_H
@@ -247,8 +247,8 @@
MYSQLND_STMT * (*stmt_init)(MYSQLND * const conn TSRMLS_DC);
- enum_func_status (*shutdown_server)(MYSQLND * const conn,
unsigned long level TSRMLS_DC);
- enum_func_status (*refresh_server)(MYSQLND * const conn,
unsigned long options TSRMLS_DC);
+ enum_func_status (*shutdown_server)(MYSQLND * const conn,
uint8_t level TSRMLS_DC);
+ enum_func_status (*refresh_server)(MYSQLND * const conn, uint8_t
options TSRMLS_DC);
enum_func_status (*ping)(MYSQLND * const conn TSRMLS_DC);
enum_func_status (*kill_connection)(MYSQLND *conn, unsigned int
pid TSRMLS_DC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
