diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2013-11-07 07:54:08 -0800 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2013-11-07 07:54:08 -0800 |
| commit | 54fe719953eec91e4416addae1bda2c3f9ce82bb (patch) | |
| tree | 5a7214613ac0da55f6b23c615e900332be31b9fb /ext/mysqlnd/mysqlnd.c | |
| parent | bb42643ae02c6bb522db169748d29e4be6695b1e (diff) | |
| parent | 91108818e1554ed542a13148e6d8b79e29e77935 (diff) | |
| download | php-git-54fe719953eec91e4416addae1bda2c3f9ce82bb.tar.gz | |
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
Add a couple more test cases to parse_url() tests
fix missing change from 'tcp_socket' to the more common 'server'
fix many parallel test issues
Cleanup temp test file
Revert "Fixed issue #115 (path issue when using phar)."
Remove outdate codes, make it clearer, although just a bit..
Update NEWS
Fixed Bug #66034 (Segmentation Fault when constructor of PDO statement throws an exception)
Fixed coredump due to abnormal implemention of phar
Typo fix: umknown -> unknown
Fix bug #66008
5.4.23-dev
remove "PHP 6" staff
Diffstat (limited to 'ext/mysqlnd/mysqlnd.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index 169577ff97..c9e134f7a3 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -2247,7 +2247,6 @@ MYSQLND_METHOD(mysqlnd_conn_data, change_user)(MYSQLND_CONN_DATA * const conn, } if (!db) { db = ""; - } /* XXX: passwords that have \0 inside work during auth, but in this case won't work with change user */ |