[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqlnd/mysqlnd.c ext/mysqlnd/mysqlnd.h ext/mysqlnd/mysqlnd_alloc.c ext/mysqlnd/mysqlnd_alloc.h ext/mysqlnd/mysqlnd_auth.c ext/mysqlnd/mysqlnd_bt.c ext/mysqlnd/mysqlnd_debug.c ext/mysqlnd/mysqlnd_debug.h ext/mysqlnd/mysqlnd_driver.c ext/mysqlnd/mysqlnd_enum_n_def.h ext/mysqlnd/mysqlnd_ext_plugin.c ext/mysqlnd/mysqlnd_loaddata.c ext/mysqlnd/mysqlnd_net.c ext/mysqlnd/mysqlnd_plugin.c ext/mysqlnd

[Xinchen Hui]

Commit:    cbb5d42b9b970b04a2e328c6b8e211419f43b0c2
Author:    Xinchen Hui <larue...@php.net>         Sun, 6 Jan 2013 10:23:21 +0800
Parents:   f3824ad16644c53645e7428d2e838278f5a0e1c4 
a426e0b05074621643c44b67ed2d0d8674721bf5
Branches:  PHP-5.5

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

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

Changed paths:
  MM  ext/mysqlnd/mysqlnd.c
  MM  ext/mysqlnd/mysqlnd.h
  MM  ext/mysqlnd/mysqlnd_alloc.c
  MM  ext/mysqlnd/mysqlnd_alloc.h
  MM  ext/mysqlnd/mysqlnd_auth.c
  MM  ext/mysqlnd/mysqlnd_bt.c
  MM  ext/mysqlnd/mysqlnd_debug.c
  MM  ext/mysqlnd/mysqlnd_debug.h
  MM  ext/mysqlnd/mysqlnd_driver.c
  MM  ext/mysqlnd/mysqlnd_enum_n_def.h
  MM  ext/mysqlnd/mysqlnd_ext_plugin.c
  MM  ext/mysqlnd/mysqlnd_loaddata.c
  MM  ext/mysqlnd/mysqlnd_net.c
  MM  ext/mysqlnd/mysqlnd_plugin.c
  MM  ext/mysqlnd/mysqlnd_priv.h
  MM  ext/mysqlnd/mysqlnd_ps.c
  MM  ext/mysqlnd/mysqlnd_ps_codec.c
  MM  ext/mysqlnd/mysqlnd_result.c
  MM  ext/mysqlnd/mysqlnd_result_meta.c
  MM  ext/mysqlnd/mysqlnd_reverse_api.h
  MM  ext/mysqlnd/mysqlnd_statistics.c
  MM  ext/mysqlnd/mysqlnd_structs.h
  MM  ext/mysqlnd/mysqlnd_wireprotocol.c
  MM  ext/mysqlnd/mysqlnd_wireprotocol.h
  MM  ext/mysqlnd/php_mysqlnd.c
  MM  ext/phar/phar_path_check.c


Diff:



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