diff options
| author | Johannes Schlüter <johannes@php.net> | 2008-10-27 18:32:08 +0000 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2008-10-27 18:32:08 +0000 |
| commit | 40e42663f57080367849b2ab5dd3411049380d57 (patch) | |
| tree | f81ab89a5e84ddb6a046529bd5c8a30073800a47 /ext/pdo_mysql/mysql_driver.c | |
| parent | 806ea848f499ea9768a3ef3c0cadd5c3ab0cf867 (diff) | |
| download | php-git-40e42663f57080367849b2ab5dd3411049380d57.tar.gz | |
MFH: Fix #44135 (PDO MySQL does not support CLIENT_FOUND_ROWS)
Diffstat (limited to 'ext/pdo_mysql/mysql_driver.c')
| -rwxr-xr-x | ext/pdo_mysql/mysql_driver.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index 19357365d3..68cea255df 100755 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c @@ -636,6 +636,14 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_ H->max_buffer_size = pdo_attr_lval(driver_options, PDO_MYSQL_ATTR_MAX_BUFFER_SIZE, H->max_buffer_size TSRMLS_CC); #endif + if (pdo_attr_lval(driver_options, PDO_MYSQL_ATTR_FOUND_ROWS, 0 TSRMLS_CC)) { + connect_opts |= CLIENT_FOUND_ROWS; + } + + if (pdo_attr_lval(driver_options, PDO_MYSQL_ATTR_IGNORE_SPACE, 0 TSRMLS_CC)) { + connect_opts |= CLIENT_IGNORE_SPACE; + } + if (mysql_options(H->server, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&connect_timeout)) { pdo_mysql_error(dbh); goto cleanup; |