pajoye Thu Mar 23 01:24:36 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/ext/pdo_mysql mysql_driver.c Log: - Fixed fetching of string value bigger than 128bytes when no options are used http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.59.2.11&r2=1.59.2.12&diff_format=u Index: php-src/ext/pdo_mysql/mysql_driver.c diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.11 php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.12 --- php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.11 Fri Mar 17 00:15:09 2006 +++ php-src/ext/pdo_mysql/mysql_driver.c Thu Mar 23 01:24:36 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mysql_driver.c,v 1.59.2.11 2006/03/17 00:15:09 iliaa Exp $ */ +/* $Id: mysql_driver.c,v 1.59.2.12 2006/03/23 01:24:36 pajoye Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -440,6 +440,7 @@ } dbh->driver_data = H; + H->max_buffer_size = 1024*1024; /* handle MySQL options */ if (driver_options) { @@ -449,7 +450,7 @@ H->buffered = pdo_attr_lval(driver_options, PDO_MYSQL_ATTR_USE_BUFFERED_QUERY, 0 TSRMLS_CC); H->emulate_prepare = pdo_attr_lval(driver_options, PDO_MYSQL_ATTR_DIRECT_QUERY, 0 TSRMLS_CC); - H->max_buffer_size = pdo_attr_lval(driver_options, PDO_MYSQL_ATTR_MAX_BUFFER_SIZE, 1024 * 1024 TSRMLS_CC); + H->max_buffer_size = pdo_attr_lval(driver_options, PDO_MYSQL_ATTR_MAX_BUFFER_SIZE, H->max_buffer_size TSRMLS_CC); if (mysql_options(H->server, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&connect_timeout)) { pdo_mysql_error(dbh);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php