cvs: php-src /ext/mysqli mysqli.c mysqli_api.c

georg Wed Apr 20 08:50:15 2005 EDT Modified files: /php-src/ext/mysqli mysqli.c mysqli_api.c Log: added support for data truncation (bind_result) for MySQL 5.0.5 http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli.c?r1=1.64&r2=1.65&ty=u Index: php-src/ext/mysqli/mysqli.c diff -u php-src/ext/mysqli/mysqli.c:1.64 php-src/ext/mysqli/mysqli.c:1.65 --- php-src/ext/mysqli/mysqli.c:1.64 Mon Apr 18 02:03:29 2005 +++ php-src/ext/mysqli/mysqli.c Wed Apr 20 08:50:13 2005 @@ -15,7 +15,7 @@ | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli.c,v 1.64 2005/04/18 06:03:29 georg Exp $ + $Id: mysqli.c,v 1.65 2005/04/20 12:50:13 georg Exp $ */ #ifdef HAVE_CONFIG_H @@ -561,8 +561,11 @@ REGISTER_LONG_CONSTANT("MYSQLI_RPL_SLAVE", MYSQL_RPL_SLAVE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_RPL_ADMIN", MYSQL_RPL_ADMIN, CONST_CS | CONST_PERSISTENT); - /* bind blob support */ + /* bind support */ REGISTER_LONG_CONSTANT("MYSQLI_NO_DATA", MYSQL_NO_DATA, CONST_CS | CONST_PERSISTENT); +#ifdef MYSQL_DATA_TRUNCATION + REGISTER_LONG_CONSTANT("MYSQLI_DATA_TRUNCATION", MYSQL_DATA_TRUNCATION, CONST_CS | CONST_PERSISTENT); +#endif /* reporting */ REGISTER_LONG_CONSTANT("MYSQLI_REPORT_INDEX", MYSQLI_REPORT_INDEX, CONST_CS | CONST_PERSISTENT); http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.104&r2=1.105&ty=u Index: php-src/ext/mysqli/mysqli_api.c diff -u php-src/ext/mysqli/mysqli_api.c:1.104 php-src/ext/mysqli/mysqli_api.c:1.105 --- php-src/ext/mysqli/mysqli_api.c:1.104 Tue Apr 19 09:28:41 2005 +++ php-src/ext/mysqli/mysqli_api.c Wed Apr 20 08:50:13 2005 @@ -15,7 +15,7 @@ | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli_api.c,v 1.104 2005/04/19 13:28:41 andrey Exp $ + $Id: mysqli_api.c,v 1.105 2005/04/20 12:50:13 georg Exp $ */ #ifdef HAVE_CONFIG_H @@ -606,7 +606,12 @@ memset(stmt->result.buf[i].val, 0, stmt->result.buf[i].buflen); } } - if (!(ret = mysql_stmt_fetch(stmt->stmt))) { + ret = mysql_stmt_fetch(stmt->stmt); +#ifdef MYSQL_DATA_TRUNCATED + if (!ret || ret == MYSQL_DATA_TRUNCATED) { +#else + if (!ret || ret == MYSQL_DATA_TRUNCATED) { +#endif for (i = 0; i < stmt->result.var_cnt; i++) { if (stmt->result.vars[i]->type == IS_STRING && stmt->result.vars[i]->value.str.len) { efree(stmt->result.vars[i]->value.str.val);