cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd.h mysqlnd_wireprotocol.c

andrey Mon Sep 15 14:07:44 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mysqlnd mysqlnd.h mysqlnd_wireprotocol.c Log: MFH:Compile-in a string-to-int conversion for INT columns by default, controlled by a ini setting. http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.h?r1=1.3.2.16&r2=1.3.2.17&diff_format=u Index: php-src/ext/mysqlnd/mysqlnd.h diff -u php-src/ext/mysqlnd/mysqlnd.h:1.3.2.16 php-src/ext/mysqlnd/mysqlnd.h:1.3.2.17 --- php-src/ext/mysqlnd/mysqlnd.h:1.3.2.16 Tue Jun 24 11:01:38 2008 +++ php-src/ext/mysqlnd/mysqlnd.h Mon Sep 15 14:07:44 2008 @@ -18,19 +18,19 @@ +----------------------------------------------------------------------+ */ -/* $Id: mysqlnd.h,v 1.3.2.16 2008/06/24 11:01:38 andrey Exp $ */ +/* $Id: mysqlnd.h,v 1.3.2.17 2008/09/15 14:07:44 andrey Exp $ */ #ifndef MYSQLND_H #define MYSQLND_H -#define MYSQLND_VERSION "mysqlnd 5.0.4-dev - 080501 - $Revision: 1.3.2.16 $" +#define MYSQLND_VERSION "mysqlnd 5.0.4-dev - 080501 - $Revision: 1.3.2.17 $" #define MYSQLND_VERSION_ID 50004 /* This forces inlining of some accessor functions */ -#define MYSQLND_USE_OPTIMISATIONS 0 +#define MYSQLND_USE_OPTIMISATIONS 1 -/* #define MYSQLND_STRING_TO_INT_CONVERSION */ +#define MYSQLND_STRING_TO_INT_CONVERSION /* This force mysqlnd to do a single (or more depending on ammount of data) non-blocking read() calls before sending a command to the server. Useful http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_wireprotocol.c?r1=1.4.2.17&r2=1.4.2.18&diff_format=u Index: php-src/ext/mysqlnd/mysqlnd_wireprotocol.c diff -u php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.17 php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.18 --- php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.17 Fri Sep 12 15:08:41 2008 +++ php-src/ext/mysqlnd/mysqlnd_wireprotocol.c Mon Sep 15 14:07:44 2008 @@ -1564,7 +1564,7 @@ ZVAL_LONG(*current_field, v); } else { uint64 v = (uint64) atoll((char *) p); - zend_bool uns = packet->fields_metadata[i].flags & UNSIGNED_FLAG? TRUE:FALSE; + zend_bool uns = fields_metadata[i].flags & UNSIGNED_FLAG? TRUE:FALSE; /* We have to make it ASCIIZ temporarily */ #if SIZEOF_LONG==8 if (uns == TRUE && v > 9223372036854775807L) @@ -1581,7 +1581,7 @@ } *(p + len) = save; } else -#endif +#endif /* MYSQLND_STRING_TO_INT_CONVERSION */ if (fields_metadata[i].type == MYSQL_TYPE_BIT) { /* BIT fields are specially handled. As they come as bit mask, we have