diff options
author | Anatol Belski <ab@php.net> | 2014-08-25 21:51:49 +0200 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-08-25 21:51:49 +0200 |
commit | af59e92b24c8f624672720d47ef65bd8457728b9 (patch) | |
tree | 1da992a4689783e1351760a8702cbf6844ad37aa /ext/mysqlnd/mysqlnd_ps_codec.c | |
parent | b9514bb8fd27e2d841bab3eb256fcbaa613aa049 (diff) | |
download | php-git-af59e92b24c8f624672720d47ef65bd8457728b9.tar.gz |
master renames phase 7PRE_AST_MERGE
Diffstat (limited to 'ext/mysqlnd/mysqlnd_ps_codec.c')
-rw-r--r-- | ext/mysqlnd/mysqlnd_ps_codec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/mysqlnd/mysqlnd_ps_codec.c b/ext/mysqlnd/mysqlnd_ps_codec.c index 2e414cacef..7cb462960b 100644 --- a/ext/mysqlnd/mysqlnd_ps_codec.c +++ b/ext/mysqlnd/mysqlnd_ps_codec.c @@ -640,7 +640,7 @@ mysqlnd_stmt_execute_prepare_param_types(MYSQLND_STMT_DATA * stmt, zval ** copie stmt->send_types_to_server = *resend_types_next_time = 1; convert_to_string_ex(tmp_data); } else { - convert_to_int_ex(tmp_data); + convert_to_long_ex(tmp_data); } zval_ptr_dtor(&tmp_data_copy); @@ -684,7 +684,7 @@ mysqlnd_stmt_execute_store_types(MYSQLND_STMT_DATA * stmt, zval * copies, zend_u current_type = MYSQL_TYPE_VAR_STRING; /* don't change stmt->param_bind[i].type to MYSQL_TYPE_VAR_STRING - we force convert_to_int_ex in all cases, thus the type will be right in the next switch. + we force convert_to_long_ex in all cases, thus the type will be right in the next switch. if the type is however not long, then we will do a goto in the next switch. We want to preserve the original bind type given by the user. Thus, we do these hacks. */ @@ -751,7 +751,7 @@ mysqlnd_stmt_execute_calculate_param_values_size(MYSQLND_STMT_DATA * stmt, zval if (Z_TYPE_P(tmp_data) == IS_STRING) { goto use_string; } - convert_to_int_ex(tmp_data); + convert_to_long_ex(tmp_data); } *data_size += 4 + is_longlong; break; |