diff options
| author | Anatol Belski <ab@php.net> | 2013-07-14 20:48:26 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-07-14 20:48:26 +0200 |
| commit | 6e3134610c57e61fc2c05b6ffc3b741323ac6f0e (patch) | |
| tree | 727693d04c25cd477e7e641f0e8497c115429f3f | |
| parent | add0833681bba61f1953262f81286cb4a56f0431 (diff) | |
| parent | 67c03eac620993e0c323658ab5cd6bff4616cbfb (diff) | |
| download | php-git-6e3134610c57e61fc2c05b6ffc3b741323ac6f0e.tar.gz | |
Merge branch 'PHP-5.4' of https://github.com/php/php-src into PHP-5.4
| -rw-r--r-- | ext/pdo_dblib/dblib_driver.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/pdo_dblib/dblib_driver.c b/ext/pdo_dblib/dblib_driver.c index c54cd73d84..ff42514721 100644 --- a/ext/pdo_dblib/dblib_driver.c +++ b/ext/pdo_dblib/dblib_driver.c @@ -350,6 +350,12 @@ static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_ DBSETLAPP(H->login, vars[1].optval); +#ifdef DBSETLDBNAME + if (vars[3].optval) { + DBSETLDBNAME(H->login, vars[3].optval); + } +#endif + H->link = dbopen(H->login, vars[2].optval); if (!H->link) { @@ -365,12 +371,6 @@ static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_ /* allow double quoted indentifiers */ DBSETOPT(H->link, DBQUOTEDIDENT, "1"); -#ifdef DBSETLDBNAME - if (vars[3].optval) { - DBSETLDBNAME(H->login, vars[3].optval); - } -#endif - ret = 1; dbh->max_escaped_char_length = 2; dbh->alloc_own_columns = 1; |