diff options
author | Zheng SHAO <z-shao@colopl.co.jp> | 2016-12-20 00:57:22 +0900 |
---|---|---|
committer | Zheng SHAO <z-shao@colopl.co.jp> | 2016-12-20 09:48:47 +0900 |
commit | 884e2a0519b15bdd552c25c658c2ff233ff53a81 (patch) | |
tree | b4958d09206e5e2cae7951d14863f244d46e2cd4 /ext/pdo_firebird/firebird_statement.c | |
parent | fb98907d2de619e2b2a5e4edb531ae5e33f6ab37 (diff) | |
parent | 9fb8ea58b59fe742c7c21de1b3878edb560db534 (diff) | |
download | php-git-884e2a0519b15bdd552c25c658c2ff233ff53a81.tar.gz |
Fixed NEWS conflicts
Diffstat (limited to 'ext/pdo_firebird/firebird_statement.c')
-rw-r--r-- | ext/pdo_firebird/firebird_statement.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/pdo_firebird/firebird_statement.c b/ext/pdo_firebird/firebird_statement.c index f719ecc36d..64968428bd 100644 --- a/ext/pdo_firebird/firebird_statement.c +++ b/ext/pdo_firebird/firebird_statement.c @@ -152,8 +152,8 @@ static int firebird_stmt_execute(pdo_stmt_t *stmt) /* {{{ */ } *S->name = 0; - S->cursor_open = (S->out_sqlda.sqln > 0); /* A cursor is opened, when more than zero columns returned */ - S->exhausted = !S->cursor_open; + S->cursor_open = S->out_sqlda.sqln && (S->statement_type != isc_info_sql_stmt_exec_procedure); + S->exhausted = !S->out_sqlda.sqln; /* There are data to fetch */ return 1; } while (0); |