From: Andrey Hristov <andrey@php.net>
Date: Wed, 5 Mar 2014 14:24:43 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~503^2~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=529fdd5bb0af3a5d73524ba870a62cd33bec4dce;p=php

Merge branch 'PHP-5.6'
---

529fdd5bb0af3a5d73524ba870a62cd33bec4dce
diff --cc ext/mysqlnd/mysqlnd_ps.c
index 07913e0dc1,dc97d2d36f..3e43f6eae6
--- a/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);