cvs: php-src /ext/mysqli mysqli_nonapi.c
| From: | Ilia Alshanetsky | Date: | Tue, 21 Mar 2006 15:35:48 +0000 |
| Subject: | cvs: php-src /ext/mysqli mysqli_nonapi.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-37401@lists.php.net to get a copy of this message | ||
iliaa Tue Mar 21 15:35:48 2006 UTC
Modified files:
/php-src/ext/mysqli mysqli_nonapi.c
Log:
MFB51: Fixed bug #36802 (mysqli_set_charset() crash with a non-open connection).
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.59&r2=1.60&diff_format=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.59 php-src/ext/mysqli/mysqli_nonapi.c:1.60
--- php-src/ext/mysqli/mysqli_nonapi.c:1.59 Sun Jan 1 13:09:52 2006
+++ php-src/ext/mysqli/mysqli_nonapi.c Tue Mar 21 15:35:48 2006
@@ -15,7 +15,7 @@
| Author: Georg Richter <georg@php.net> |
+----------------------------------------------------------------------+
- $Id: mysqli_nonapi.c,v 1.59 2006/01/01 13:09:52 sniper Exp $
+ $Id: mysqli_nonapi.c,v 1.60 2006/03/21 15:35:48 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -326,7 +326,7 @@
}
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL*, &mysql_link, "mysqli_link");
- if (mysql_set_character_set(mysql->mysql, cs_name)) {
+ if (!mysql->mysql->thread_id || mysql_set_character_set(mysql->mysql, cs_name)) {
RETURN_FALSE;
}
RETURN_TRUE;