com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/mysqli/my sqli_api.c ext/mysqlnd/mysqlnd.c
| From: | Andrey Hristov | Date: | Thu, 20 Mar 2014 14:16:12 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/mysqli/my sqli_api.c ext/mysqlnd/mysqlnd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76568@lists.php.net to get a copy of this message | ||
Commit: e52334fdbecc1eba1a800f70bcfdcdf02c70ebd1
Author: Andrey Hristov <andrey@php.net> Thu, 20 Mar 2014 16:16:12 +0200
Parents: e1fe76f28ae4d93306c53477968311924f83bb79 059bc99d941a9984c88b80562e39421850fb2690
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e52334fdbecc1eba1a800f70bcfdcdf02c70ebd1
Log:
Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
ext/mysqli/mysqli_api.c
Changed paths:
MM ext/mysqli/mysqli_api.c
MM ext/mysqlnd/mysqlnd.c
Diff: