com php-src: Merge branch 'PHP-5.6': ext/mysqlnd/mysqlnd_ps .c

Commit: 529fdd5bb0af3a5d73524ba870a62cd33bec4dce Author: Andrey Hristov <andrey@php.net> Wed, 5 Mar 2014 16:24:43 +0200 Parents: 1a94fca35e4149cbd7d681524dab8ef5720d5da1 6b804b96b8c454954d30ed8f0cf1a05d91801c4f Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=529fdd5bb0af3a5d73524ba870a62cd33bec4dce Log: Merge branch 'PHP-5.6' Changed paths: MM ext/mysqlnd/mysqlnd_ps.c Diff: diff --cc ext/mysqlnd/mysqlnd_ps.c index 07913e0,dc97d2d..3e43f6e --- 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);