diff options
| author | Andrey Hristov <andrey@php.net> | 2013-03-13 15:29:40 +0100 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2013-03-13 15:29:40 +0100 |
| commit | 7503a4b4a4d0ffe4140f5afab9cae45aaa691c4a (patch) | |
| tree | 22c836c50ff39e5bbb1e4262fea8046213aa7cb2 /ext/pdo_mysql | |
| parent | 28634bf603d312bf066eab0a95700ae187d8d347 (diff) | |
| parent | 0777a18703d9be2ea8efd85c0352863b8768e49e (diff) | |
| download | php-git-7503a4b4a4d0ffe4140f5afab9cae45aaa691c4a.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
NEWS
Diffstat (limited to 'ext/pdo_mysql')
| -rw-r--r-- | ext/pdo_mysql/mysql_statement.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c index f2e36c1719..2ae559571d 100644 --- a/ext/pdo_mysql/mysql_statement.c +++ b/ext/pdo_mysql/mysql_statement.c @@ -343,7 +343,6 @@ static int pdo_mysql_stmt_next_rowset(pdo_stmt_t *stmt TSRMLS_DC) /* {{{ */ pdo_mysql_stmt *S = (pdo_mysql_stmt*)stmt->driver_data; pdo_mysql_db_handle *H = S->H; long row_count; - int ret; PDO_DBG_ENTER("pdo_mysql_stmt_next_rowset"); PDO_DBG_INF_FMT("stmt=%p", S->stmt); @@ -412,26 +411,21 @@ static int pdo_mysql_stmt_next_rowset(pdo_stmt_t *stmt TSRMLS_DC) /* {{{ */ S->result = NULL; } - ret = mysql_next_result(H->server); + if (!mysql_more_results(H->server)) { + /* No more results */ + PDO_DBG_RETURN(0); + } #if PDO_USE_MYSQLND - /* for whatever reason mysqlnd breaks with libmysql compatibility at the C level, no -1 */ - if (PASS != ret) { + if (mysql_next_result(H->server) == FAIL) { pdo_mysql_error_stmt(stmt); PDO_DBG_RETURN(0); - } - if (mysql_more_results(H->server)) { - PDO_DBG_RETURN(pdo_mysql_fill_stmt_from_result(stmt TSRMLS_CC)); } else { - /* No more results */ - PDO_DBG_RETURN(0); + PDO_DBG_RETURN(pdo_mysql_fill_stmt_from_result(stmt TSRMLS_CC)); } #else - if (ret > 0) { + if (mysql_next_result(H->server) > 0) { pdo_mysql_error_stmt(stmt); PDO_DBG_RETURN(0); - } else if (ret < 0) { - /* No more results */ - PDO_DBG_RETURN(0); } else { PDO_DBG_RETURN(pdo_mysql_fill_stmt_from_result(stmt TSRMLS_CC)); } |