diff options
| author | andrey <andrey@php.net> | 2012-07-09 17:59:42 +0300 |
|---|---|---|
| committer | andrey <andrey@php.net> | 2012-07-09 17:59:42 +0300 |
| commit | 66e1ac23c1601abb66fa78bff87453e5e37a9377 (patch) | |
| tree | 19b707c38dda43d747dd923ac05974632bcb07fc /ext/pdo_mysql/mysql_statement.c | |
| parent | 555db7dc4ecaffdbfb4a10f4d00ddd81c0f89ef6 (diff) | |
| parent | 2032470e4113dfbf04a1ed3b12de85ffcde6f367 (diff) | |
| download | php-git-66e1ac23c1601abb66fa78bff87453e5e37a9377.tar.gz | |
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
Diffstat (limited to 'ext/pdo_mysql/mysql_statement.c')
| -rwxr-xr-x | ext/pdo_mysql/mysql_statement.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c index 0c2689f9d5..fc5ec5135b 100755 --- a/ext/pdo_mysql/mysql_statement.c +++ b/ext/pdo_mysql/mysql_statement.c @@ -134,7 +134,7 @@ static int pdo_mysql_fill_stmt_from_result(pdo_stmt_t *stmt TSRMLS_DC) /* {{{ */ row_count = mysql_affected_rows(H->server); if (row_count == (my_ulonglong)-1) { - /* we either have a query that returned a result set or an error occured + /* we either have a query that returned a result set or an error occurred lets see if we have access to a result set */ if (!H->buffered) { S->result = mysql_use_result(H->server); |