diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-07-14 17:01:43 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-07-14 17:01:43 -0700 |
| commit | 9cc9d32e6a1236cd55ab3bb1bf660932d3721f18 (patch) | |
| tree | 5cc85398f10944b90cb9ad57e2e7d958f91ee3df /ext | |
| parent | 168a5bb6dfe7de976e2372d3c5d8773f3bf03727 (diff) | |
| parent | f4b9b20b354c059d7246a250953e73365558f5e6 (diff) | |
| download | php-git-9cc9d32e6a1236cd55ab3bb1bf660932d3721f18.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Add built-in web server to invocation list
Terminology: change embedded web server to built-in web server to align with cli usage
Align -B and -E parameter names with cli usage (begin_code and end_code)
Fix Bug #65219 DBSETLDBNAME should be called before login to set DBNAME in login record
Diffstat (limited to 'ext')
| -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; |