Merge branch 'PHP-5.6'

diff --cc ext/mysqlnd/mysqlnd_ps.c
index 07913e0dc1ebf5c50f5b653ce7adb81c32b46708,dc97d2d36fae5a813d30b2a23eed48bfdcbc44a5..3e43f6eae670a5af8ce5caafeadcda85c3fdc51c
--- 1/ext/mysqlnd/mysqlnd_ps.c
--- 2/ext/mysqlnd/mysqlnd_ps.c
+++ b/ext/mysqlnd/mysqlnd_ps.c
@@@ -38,16 -38,7 +38,8 @@@ const char * const mysqlnd_stmt_not_pre
  
  /* Exported by mysqlnd_ps_codec.c */
  enum_func_status mysqlnd_stmt_execute_generate_request(MYSQLND_STMT * const s, zend_uchar ** request, size_t *request_len, zend_bool * free_buffer TSRMLS_DC);
 +enum_func_status mysqlnd_stmt_execute_batch_generate_request(MYSQLND_STMT * const s, zend_uchar ** request, size_t *request_len, zend_bool * free_buffer TSRMLS_DC);
  
- enum_func_status mysqlnd_stmt_fetch_row_buffered(MYSQLND_RES *result, void *param,
-                                                                                               unsigned int flags,
-                                                                                               zend_bool *fetched_anything TSRMLS_DC);
- 
- enum_func_status mysqlnd_fetch_stmt_row_cursor(MYSQLND_RES *result, void *param,
-                                                                                          unsigned int flags,
-                                                                                          zend_bool *fetched_anything TSRMLS_DC);
- 
  static void mysqlnd_stmt_separate_result_bind(MYSQLND_STMT * const stmt TSRMLS_DC);
  static void mysqlnd_stmt_separate_one_result_bind(MYSQLND_STMT * const stmt, unsigned int param_no TSRMLS_DC);