com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/mysqlnd/m ysqlnd_net.c
| From: | Anatol Belski | Date: | Wed, 27 Aug 2014 10:11:35 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/mysqlnd/m ysqlnd_net.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81195@lists.php.net to get a copy of this message | ||
Commit: 4d667eeaf39853c4c7cbae9f5eaad40c704bffe8
Author: Anatol Belski <ab@php.net> Wed, 27 Aug 2014 12:11:35 +0200
Parents: 1d6e9e8fb7b2340f775798b334f9bc0fa2c526f0 7fac56e0729385bbd2bb040f06a20a697d9de5fd
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4d667eeaf39853c4c7cbae9f5eaad40c704bffe8
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fixed DBG_INF macro name
Changed paths:
MM ext/mysqlnd/mysqlnd_net.c
Diff: