[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/mysqlnd/mysqlnd.c ext/mysqlnd/mysqlnd.h ext/mysqlnd/mysqlnd_charset.c ext/mysqlnd/mysqlnd_charset.h ext/mysqlnd/mysqlnd_debug.c ext/mysqlnd/mysqlnd_debug.h ext/mysqlnd/mysqlnd_enum_n_def.h ext/mysqlnd/mysqlnd_loaddata.c ext/mysqlnd/mysqlnd_net.c ext/mysqlnd/mysqlnd_net.h ext/mysqlnd/mysqlnd_priv.h ext/mysqlnd/mysqlnd_ps.c ext/mysqlnd/mysqlnd_ps_codec.c ext/mysqlnd/mysqlnd_result.c ext/mysqlnd/

[Xinchen Hui]

Commit:    c2f8e9050439a2987d18a8ec4c060805ddc0dc8a
Author:    Xinchen Hui <larue...@php.net>         Sun, 6 Jan 2013 10:20:00 +0800
Parents:   2feea39a3320d100bae8a1193aba9022726a24ea 
bc11e6fdbbafbd0969fc47fa087c2245317cd31f
Branches:  PHP-5.4

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

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

Changed paths:
  MM  ext/mysqlnd/mysqlnd.c
  MM  ext/mysqlnd/mysqlnd.h
  MM  ext/mysqlnd/mysqlnd_charset.c
  MM  ext/mysqlnd/mysqlnd_charset.h
  MM  ext/mysqlnd/mysqlnd_debug.c
  MM  ext/mysqlnd/mysqlnd_debug.h
  MM  ext/mysqlnd/mysqlnd_enum_n_def.h
  MM  ext/mysqlnd/mysqlnd_loaddata.c
  MM  ext/mysqlnd/mysqlnd_net.c
  MM  ext/mysqlnd/mysqlnd_net.h
  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.h
  MM  ext/mysqlnd/mysqlnd_result_meta.c
  MM  ext/mysqlnd/mysqlnd_result_meta.h
  MM  ext/mysqlnd/mysqlnd_statistics.c
  MM  ext/mysqlnd/mysqlnd_statistics.h
  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/mysqlnd/php_mysqlnd.h
  MM  ext/phar/func_interceptors.c
  MM  ext/phar/phar.c
  MM  ext/phar/phar_internal.h
  MM  ext/phar/phar_object.c
  MM  ext/phar/phar_path_check.c
  MM  ext/phar/stream.c
  MM  ext/phar/util.c


Diff:



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