com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqli/my sqli_nonapi.c ext/mysqlnd/mysqlnd.c ext/mysqlnd/mysql nd.h
| From: | Andrey Hristov | Date: | Wed, 04 Dec 2013 10:07:18 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqli/my sqli_nonapi.c ext/mysqlnd/mysqlnd.c ext/mysqlnd/mysql nd.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74241@lists.php.net to get a copy of this message | ||
Commit: ceb1b7e20fdbbdb121a67242d0848ab923915e65
Author: Andrey Hristov <andrey@php.net> Wed, 4 Dec 2013 12:07:18 +0200
Parents: 00a7b1ff7fed49df51d0392d47aa79f63bf1c66e 86aad979798a665e3f23aafb200390d51d44f8fa
Branches: PHP-5.5 PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ceb1b7e20fdbbdb121a67242d0848ab923915e65
Log:
Merge branch 'PHP-5.4' into PHP-5.5
Changed paths:
MM ext/mysqli/mysqli_nonapi.c
MM ext/mysqlnd/mysqlnd.c
MM ext/mysqlnd/mysqlnd.h
Diff: