Merge branch 'PHP-5.4' into PHP-5.5

diff --cc ext/mysqlnd/mysqlnd_alloc.c
Simple merge

diff --cc ext/mysqlnd/mysqlnd_alloc.h
index c8f1bc4cf152168a43ee638994e43801c33513dc,33c007026a81d39baaf1449b1122d6e39fca952c..e6b0f0881568cba2bce945d73dfd917f9ecbea64
--- 1/ext/mysqlnd/mysqlnd_alloc.h
--- 2/ext/mysqlnd/mysqlnd_alloc.h
+++ b/ext/mysqlnd/mysqlnd_alloc.h
@@@ -24,10 -24,10 +24,10 @@@
  #ifndef MYSQLND_ALLOC_H
  #define MYSQLND_ALLOC_H
  
- extern const char * mysqlnd_debug_std_no_trace_funcs[];
+ PHPAPI extern const char * mysqlnd_debug_std_no_trace_funcs[];
  
 -#define MYSQLND_MEM_D TSRMLS_DC ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC
 -#define MYSQLND_MEM_C TSRMLS_CC ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC
 +#define MYSQLND_MEM_D TSRMLS_DC ZEND_FILE_LINE_ORIG_DC
 +#define MYSQLND_MEM_C TSRMLS_CC ZEND_FILE_LINE_CC
  
  struct st_mysqlnd_allocator_methods
  {