diff options
| author | Anatol Belski <ab@php.net> | 2016-12-18 21:55:30 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-12-18 21:55:30 +0100 |
| commit | f077ada348565387beb08a521121e3def566daf8 (patch) | |
| tree | fc094e84a7534f65c3d8c086eb28a009f7d3bd97 /ext/pdo_firebird/firebird_statement.c | |
| parent | 7371c46518ff94858d5be20e334ebfd59e12ca3e (diff) | |
| parent | cf46ac1179376f58895feb6ed914b03bea19e295 (diff) | |
| download | php-git-f077ada348565387beb08a521121e3def566daf8.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Cursor is not opened on singleton selects.
fix arg spec and datatype, follow up on 73594
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); |