PHP mysqlnd svn commit: r251 - in trunk/ext/mysqli: . mysqlnd

[grichter]

Author: grichter
Date: 2007-03-22 16:16:15 +0100 (Thu, 22 Mar 2007)
New Revision: 251

Modified:
   trunk/ext/mysqli/config.w32
   trunk/ext/mysqli/mysqli.c
   trunk/ext/mysqli/mysqlnd/mysqlnd.c
   trunk/ext/mysqli/mysqlnd/mysqlnd_wireprotocol.c
Log:
windows fixes


Modified: trunk/ext/mysqli/config.w32
===================================================================
--- trunk/ext/mysqli/config.w32	2007-03-22 13:59:26 UTC (rev 250)
+++ trunk/ext/mysqli/config.w32	2007-03-22 15:16:15 UTC (rev 251)
@@ -8,6 +8,7 @@
   AC_DEFINE('HAVE_MYSQLND', 1, "MySQL native driver support enabled")
   ADD_SOURCES(configure_module_dirname + "/mysqlnd", 
                   "mysqlnd.c mysqlnd_charset.c mysqlnd_wireprotocol.c \
+                  mysqlnd_statistics.c mysqlnd_palloc.c mysqlnd_ps_codec.c\
                   mysqlnd_ps.c mysqlnd_loaddata.c mysqlnd_alloc.c");
 }
 

Modified: trunk/ext/mysqli/mysqli.c
===================================================================
--- trunk/ext/mysqli/mysqli.c	2007-03-22 13:59:26 UTC (rev 250)
+++ trunk/ext/mysqli/mysqli.c	2007-03-22 15:16:15 UTC (rev 251)
@@ -779,14 +779,14 @@
 	zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(values), &pos_values);
 	while (zend_hash_get_current_data_ex(Z_ARRVAL_P(values), (void **)&values_entry,
&pos_values) == SUCCESS) {
 #if PHP_MAJOR_VERSION >= 6
-		zstr	string_key;
+		zstr	*string_key;
 #else
 		char  *string_key;
 #endif
 		uint	string_key_len;
 		ulong	num_key;
 
-		zend_hash_get_current_key_ex(Z_ARRVAL_P(values), &string_key, &string_key_len,
&num_key, 0, &pos_values);
+		zend_hash_get_current_key_ex(Z_ARRVAL_P(values), string_key, &string_key_len,
&num_key, 0, &pos_values);
 
 		convert_to_string(*values_entry);
 		php_info_print_table_row(2, ZSTR(string_key), Z_STRVAL_PP(values_entry));

Modified: trunk/ext/mysqli/mysqlnd/mysqlnd.c
===================================================================
--- trunk/ext/mysqli/mysqlnd/mysqlnd.c	2007-03-22 13:59:26 UTC (rev 250)
+++ trunk/ext/mysqli/mysqlnd/mysqlnd.c	2007-03-22 15:16:15 UTC (rev 251)
@@ -2328,7 +2328,8 @@
 	enum_func_status ret;
 	php_mysql_packet_chg_user_resp chg_user_resp;
 	size_t buf_len = MYSQLND_MAX_ALLOWED_USER_LEN + 1 + SCRAMBLE_LENGTH +
MYSQLND_MAX_ALLOWED_DB_LEN + 1;
-	char buffer[buf_len], *p = buffer;
+	char buffer[MYSQLND_MAX_ALLOWED_USER_LEN + 1 + SCRAMBLE_LENGTH +
MYSQLND_MAX_ALLOWED_DB_LEN + 1];
+	char *p = buffer;
 
 	if (!user) {
 		user = "";

Modified: trunk/ext/mysqli/mysqlnd/mysqlnd_wireprotocol.c
===================================================================
--- trunk/ext/mysqli/mysqlnd/mysqlnd_wireprotocol.c	2007-03-22 13:59:26 UTC (rev 250)
+++ trunk/ext/mysqli/mysqlnd/mysqlnd_wireprotocol.c	2007-03-22 15:16:15 UTC (rev 251)
@@ -26,8 +26,12 @@
 #include "mysqlnd_palloc.h"
 #include "ext/standard/sha1.h"
 #include "php_network.h"
+#ifndef PHP_WIN32
 #include <netinet/tcp.h>
+#else
 
+#endif
+
 #define USE_CORK 0
 
 #define MYSQLND_SILENT