cvs: php-src(PHP_5_1) /ext/mysqli mysqli_api.c
| From: | Georg Richter | Date: | Sat, 11 Mar 2006 11:16:03 +0000 |
| Subject: | cvs: php-src(PHP_5_1) /ext/mysqli mysqli_api.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-37223@lists.php.net to get a copy of this message | ||
georg Sat Mar 11 11:16:03 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/mysqli mysqli_api.c
Log:
fix for MySQL 5.1 (see http://bugs.mysql.com/?id=16144)
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.16&r2=1.118.2.17&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.16 php-src/ext/mysqli/mysqli_api.c:1.118.2.17
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.16 Sun Jan 1 16:55:01 2006
+++ php-src/ext/mysqli/mysqli_api.c Sat Mar 11 11:16:03 2006
@@ -15,7 +15,7 @@
| Author: Georg Richter <georg@php.net> |
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.118.2.16 2006/01/01 16:55:01 andrey Exp $
+ $Id: mysqli_api.c,v 1.118.2.17 2006/03/11 11:16:03 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -326,7 +326,12 @@
case MYSQL_TYPE_NEWDECIMAL:
#endif
{
+#if VERSION_ID > 50999
+ /* Changed to my_bool in MySQL 5.1. See MySQL Bug #16144 */
+ my_bool tmp;
+#else
ulong tmp;
+#endif
stmt->result.buf[ofs].type = IS_STRING;
/*
If the user has called $stmt->store_result() then we have asked
@@ -1822,7 +1827,7 @@
{
MY_STMT *stmt;
zval *mysql_stmt;
- ulong value;
+ ulong value = 0;
ulong attr;
int rc;