com php-src: Merge remote-tracking branch 'origin/master' into str_size_and_int64: ext/mysqlnd/mysqlnd_ps.c ext/mysqlnd/mysqlnd_ps_codec.c
ext/mysqlnd/mysqlnd _wireprotocol.h

Commit: 727fac6290d654c884b1f9fa2d568d63117d926b Author: Anatol Belski <ab@php.net> Fri, 24 Jan 2014 04:20:21 +0100 Parents: 9debf41bfd65dc0088992aa30e3e68d70225191e 874a0bb7eb82b75de2f80f17e6d4850d5616ed15 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=727fac6290d654c884b1f9fa2d568d63117d926b Log: Merge remote-tracking branch 'origin/master' into str_size_and_int64 Conflicts: ext/mysqlnd/mysqlnd_ps_codec.c Changed paths: MM ext/mysqlnd/mysqlnd_ps.c MM ext/mysqlnd/mysqlnd_ps_codec.c MM ext/mysqlnd/mysqlnd_wireprotocol.h Diff: diff --cc ext/mysqlnd/mysqlnd_ps.c index 42338f0,2d270c9..ed0f478 --- a/ext/mysqlnd/mysqlnd_ps.c +++ b/ext/mysqlnd/mysqlnd_ps.c @@@ -38,9 -38,10 +38,10 @@@ 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, + php_uint_t flags, zend_bool *fetched_anything TSRMLS_DC); enum_func_status mysqlnd_fetch_stmt_row_cursor(MYSQLND_RES *result, void *param, diff --cc ext/mysqlnd/mysqlnd_ps_codec.c index ce78d8e,724feea..59aeeff --- a/ext/mysqlnd/mysqlnd_ps_codec.c +++ b/ext/mysqlnd/mysqlnd_ps_codec.c @@@ -666,12 -667,10 +667,10 @@@ mysqlnd_stmt_execute_store_types(MYSQLN static enum_func_status mysqlnd_stmt_execute_calculate_param_values_size(MYSQLND_STMT_DATA * stmt, zval *** copies_param, size_t * data_size TSRMLS_DC) { - unsigned int i; + php_uint_t i; DBG_ENTER("mysqlnd_stmt_execute_calculate_param_values_size"); - for (i = 0; i < stmt->param_count; i++) { - zval ** copies = NULL; - unsigned int j; + php_uint_t j; zval *the_var = stmt->param_bind[i].zv; if (!the_var || (stmt->param_bind[i].type != MYSQL_TYPE_LONG_BLOB && Z_TYPE_P(the_var) == IS_NULL)) { @@@ -744,11 -741,10 +741,10 @@@ use_string goto end; } } - copies = *copies_param; - the_var = copies[i]; + the_var = (*copies_param)[i]; } convert_to_string_ex(&the_var); - *data_size += Z_STRLEN_P(the_var); + *data_size += Z_STRSIZE_P(the_var); break; } } @@@ -761,9 -757,9 +757,9 @@@ end /* {{{ mysqlnd_stmt_execute_store_param_values */ static void - mysqlnd_stmt_execute_store_param_values(MYSQLND_STMT_DATA * stmt, zval ** copies, zend_uchar ** buf, zend_uchar ** p, size_t null_byte_offset) + mysqlnd_stmt_execute_store_param_values(MYSQLND_STMT_DATA * stmt, zval ** copies, zend_uchar * buf, zend_uchar ** p, size_t null_byte_offset) { - unsigned int i; + php_uint_t i; for (i = 0; i < stmt->param_count; i++) { zval * data = (copies && copies[i])? copies[i]: stmt->param_bind[i].zv; /* Handle long data */ diff --cc ext/mysqlnd/mysqlnd_wireprotocol.h index 1c9c418,be71d06..43aff57 --- a/ext/mysqlnd/mysqlnd_wireprotocol.h +++ b/ext/mysqlnd/mysqlnd_wireprotocol.h @@@ -300,8 -300,9 +300,9 @@@ typedef struct st_mysqlnd_packet_sha25 PHPAPI void php_mysqlnd_scramble(zend_uchar * const buffer, const zend_uchar * const scramble, const zend_uchar * const pass, size_t pass_len); -unsigned long php_mysqlnd_net_field_length(zend_uchar **packet); +php_uint_t php_mysqlnd_net_field_length(zend_uchar **packet); zend_uchar * php_mysqlnd_net_store_length(zend_uchar *packet, uint64_t length); + size_t php_mysqlnd_net_store_length_size(uint64_t length); PHPAPI const extern char * const mysqlnd_empty_string;