com php-src: Merge remote-tracking branch 'origin/master' into str_size_and_int64: ext/mysqlnd/mysqlnd_ps_co dec.c

Commit: 3b61e3ec1e1f53054e416f9d587bd41dc37a93e2 Author: Anatol Belski <ab@php.net> Fri, 24 Jan 2014 22:15:16 +0100 Parents: 727fac6290d654c884b1f9fa2d568d63117d926b a791671f4049f80d9b744a96daadc5fc0614fb57 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3b61e3ec1e1f53054e416f9d587bd41dc37a93e2 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_codec.c Diff: diff --cc ext/mysqlnd/mysqlnd_ps_codec.c index 59aeeff,d96a577..8ad1c76 --- a/ext/mysqlnd/mysqlnd_ps_codec.c +++ b/ext/mysqlnd/mysqlnd_ps_codec.c @@@ -667,10 -667,11 +667,11 @@@ 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++) { + unsigned short is_longlong = 0; - 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)) { @@@ -717,9 -711,9 +711,9 @@@ if (Z_TYPE_P(tmp_data) == IS_STRING) { goto use_string; } - convert_to_long_ex(&tmp_data); + convert_to_int_ex(&tmp_data); } - *data_size += 4; + *data_size += 4 + is_longlong; break; case MYSQL_TYPE_LONG_BLOB: if (!(stmt->param_bind[i].flags & MYSQLND_PARAM_BIND_BLOB_USED)) { @@@ -833,10 -827,10 +827,10 @@@ mysqlnd_stmt_execute_store_params(MYSQL DBG_ENTER("mysqlnd_stmt_execute_store_params"); { - unsigned int null_count = (stmt->param_count + 7) / 8; + php_uint_t null_count = (stmt->param_count + 7) / 8; if (FAIL == mysqlnd_stmt_execute_check_n_enlarge_buffer(buf, p, buf_len, provided_buffer, null_count TSRMLS_CC)) { SET_OOM_ERROR(*stmt->error_info); - goto end; + goto end; } /* put null bytes */ null_byte_offset = *p - *buf;