com php-src: Merge branch 'PHP-5.6': ext/mysqlnd/mysqlnd_ps .c
| From: | Andrey Hristov | Date: | Thu, 10 Apr 2014 15:22:01 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/mysqlnd/mysqlnd_ps .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76776@lists.php.net to get a copy of this message | ||
Commit: 6828437c119c22f47fea5ea7b777aec247c5916c
Author: Andrey Hristov <andrey@php.net> Thu, 10 Apr 2014 18:22:01 +0300
Parents: c2ce0df01b0a6e08367fec64bc35f288872c3d08 d3f390a26888eefd012b4634137318797965ea86
Branches: master
Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=6828437c119c22f47fea5ea7b777aec247c5916c
Log:
Merge branch 'PHP-5.6'
Conflicts:
NEWS
ext/mysqlnd/mysqlnd_result.c
Changed paths:
MM ext/mysqlnd/mysqlnd_ps.c
Diff: