]> granicus.if.org Git - php/commitdiff
. MFB: Fixed fetching of string value bigger than 128bytes when no options
authorPierre Joye <pajoye@php.net>
Thu, 23 Mar 2006 01:37:38 +0000 (01:37 +0000)
committerPierre Joye <pajoye@php.net>
Thu, 23 Mar 2006 01:37:38 +0000 (01:37 +0000)
  are used

ext/pdo_mysql/mysql_driver.c

index 0af165e625ebd90f1d9e7c3927e7106fd10e8304..d394c0e79a4758d9e35b105cb15e919eff9b1406 100755 (executable)
@@ -431,6 +431,7 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_
        }
        
        dbh->driver_data = H;
+       H->max_buffer_size = 1024 * 1024;
 
        /* handle MySQL options */
        if (driver_options) {
@@ -440,7 +441,7 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_
 
                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);