andrey Thu Oct 4 09:00:03 2007 UTC
Modified files:
/php-src/ext/mysqlnd mysqlnd_structs.h mysqlnd_wireprotocol.h
Log:
Fix problems in Windows build
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_structs.h?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_structs.h
diff -u php-src/ext/mysqlnd/mysqlnd_structs.h:1.1
php-src/ext/mysqlnd/mysqlnd_structs.h:1.2
--- php-src/ext/mysqlnd/mysqlnd_structs.h:1.1 Tue Oct 2 10:45:27 2007
+++ php-src/ext/mysqlnd/mysqlnd_structs.h Thu Oct 4 09:00:02 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_structs.h,v 1.1 2007/10/02 10:45:27 andrey Exp $ */
+/* $Id: mysqlnd_structs.h,v 1.2 2007/10/04 09:00:02 andrey Exp $ */
#ifndef MYSQLND_STRUCTS_H
#define MYSQLND_STRUCTS_H
@@ -62,8 +62,8 @@
{
unsigned int warning_count;
unsigned int server_status;
- unsigned long long affected_rows;
- unsigned long long last_insert_id;
+ mynd_ulonglong affected_rows;
+ mynd_ulonglong last_insert_id;
} mysqlnd_upsert_status;
@@ -344,7 +344,7 @@
char *passwd;
unsigned int *passwd_len;
char *scheme;
- unsigned long long thread_id;
+ mynd_ulonglong thread_id;
char *server_version;
char *host_info;
unsigned char *scramble;
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_wireprotocol.h?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_wireprotocol.h
diff -u php-src/ext/mysqlnd/mysqlnd_wireprotocol.h:1.3
php-src/ext/mysqlnd/mysqlnd_wireprotocol.h:1.4
--- php-src/ext/mysqlnd/mysqlnd_wireprotocol.h:1.3 Tue Oct 2 10:43:10 2007
+++ php-src/ext/mysqlnd/mysqlnd_wireprotocol.h Thu Oct 4 09:00:02 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_wireprotocol.h,v 1.3 2007/10/02 10:43:10 andrey Exp $ */
+/* $Id: mysqlnd_wireprotocol.h,v 1.4 2007/10/04 09:00:02 andrey Exp $ */
#ifndef MYSQLND_WIREPROTOCOL_H
#define MYSQLND_WIREPROTOCOL_H
@@ -225,8 +225,8 @@
*/
mysqlnd_2b warning_count;
mysqlnd_2b server_status;
- unsigned long long affected_rows;
- unsigned long long last_insert_id;
+ mynd_ulonglong affected_rows;
+ mynd_ulonglong last_insert_id;
/* This is for both LOAD DATA or info, when no result set */
char *info_or_local_file;
size_t info_or_local_file_len;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
