com php-src: fix merge mistake: ext/pdo_pgsql/pgsql_stateme nt.c

From: Date: Wed, 06 Apr 2016 16:05:39 +0000
Subject: com php-src: fix merge mistake: ext/pdo_pgsql/pgsql_stateme nt.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-91616@lists.php.net to get a copy of this message
Commit: 6489edb9585112835f1dcbbd68140b2e9e3de1c5 Author: Anatol Belski <ab@php.net> Wed, 6 Apr 2016 18:05:39 +0200 Parents: 26f9aa721178a35ce6a0e46f548c4ddb2537769c Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6489edb9585112835f1dcbbd68140b2e9e3de1c5 Log: fix merge mistake Changed paths: M ext/pdo_pgsql/pgsql_statement.c Diff: diff --git a/ext/pdo_pgsql/pgsql_statement.c b/ext/pdo_pgsql/pgsql_statement.c index fca8598...a6a69ac 100644 --- a/ext/pdo_pgsql/pgsql_statement.c +++ b/ext/pdo_pgsql/pgsql_statement.c @@ -637,7 +637,7 @@ static int pgsql_stmt_get_column_meta(pdo_stmt_t *stmt, zend_long colno, zval *r add_assoc_long(return_value, "pgsql:table_oid", table_oid); table_name = pdo_pgsql_translate_oid_to_table(table_oid, S->H->server); if (table_name) { - add_assoc_string(return_value, "table", table_name, 1); + add_assoc_string(return_value, "table", table_name); } switch (S->cols[colno].pgsql_type) {

« previous php.cvs (#91616) next »