[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqli/mysqli.c ext/mysqlnd/mysqlnd_result.c

[Xinchen Hui]

Commit:    1c07590ed7bf8b5fca9f232eae321e26f05acbd9
Author:    Xinchen Hui <larue...@php.net>         Sat, 27 Apr 2013 23:41:51 
+0800
Parents:   ca148c030fd71203ea026263ce99be3ec49f0865 
8f5a534b215905790a4dd5465804c1fbc21468c4
Branches:  PHP-5.5 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=1c07590ed7bf8b5fca9f232eae321e26f05acbd9

Log:
Merge branch 'PHP-5.4' into PHP-5.5

Changed paths:
  MM  ext/mysqli/mysqli.c
  MM  ext/mysqlnd/mysqlnd_result.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php