archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

WS fixes

Browse source
This commit is contained in:
Andrey Hristov 2010-09-23 16:03:22 +00:00
parent 1ab38567b9
commit 859a1404bf
12 changed files with 43 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/mysqlnd/mysqlnd.c
View file

@ -1200,7 +1200,7 @@ MYSQLND_METHOD(mysqlnd_conn, list_fields)(MYSQLND * conn, const char *table, con
/* /*
Prepare for the worst case. Prepare for the worst case.
MyISAM goes to 2500 BIT columns, double it for safety. MyISAM goes to 2500 BIT columns, double it for safety.
*/ */
result = conn->m->result_init(5000, conn->persistent TSRMLS_CC); result = conn->m->result_init(5000, conn->persistent TSRMLS_CC);
if (!result) { if (!result) {
DBG_RETURN(NULL); DBG_RETURN(NULL);

1
ext/mysqlnd/mysqlnd_block_alloc.c
View file

@ -104,7 +104,6 @@ mysqlnd_mempool_resize_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk, unsigned int siz
DBG_RETURN(FAIL); DBG_RETURN(FAIL);
} }
chunk->ptr = new_ptr; chunk->ptr = new_ptr;
} }
DBG_RETURN(PASS); DBG_RETURN(PASS);
} }

3
ext/mysqlnd/mysqlnd_ps.c
View file

@ -1320,8 +1320,7 @@ MYSQLND_METHOD(mysqlnd_stmt, send_long_data)(MYSQLND_STMT * const s, unsigned in
memcpy(cmd_buf + STMT_ID_LENGTH + 2, data, length); memcpy(cmd_buf + STMT_ID_LENGTH + 2, data, length);
/* COM_STMT_SEND_LONG_DATA doesn't send an OK packet*/ /* COM_STMT_SEND_LONG_DATA doesn't send an OK packet*/
ret = conn->m->simple_command(conn, cmd, (char *)cmd_buf, packet_len, ret = conn->m->simple_command(conn, cmd, (char *)cmd_buf, packet_len, PROT_LAST , FALSE, TRUE TSRMLS_CC);
PROT_LAST , FALSE, TRUE TSRMLS_CC);
mnd_efree(cmd_buf); mnd_efree(cmd_buf);
if (FAIL == ret) { if (FAIL == ret) {
stmt->error_info = conn->error_info; stmt->error_info = conn->error_info;

2
ext/mysqlnd/mysqlnd_ps_codec.c
View file

@ -619,7 +619,6 @@ mysqlnd_stmt_execute_store_params(MYSQLND_STMT * s, zend_uchar **buf, zend_uchar
time we try to send > LONG_MAX, the conversion to string will send a string and the server time we try to send > LONG_MAX, the conversion to string will send a string and the server
won't expect it and interpret the value as 0. Thus we need to resend the types, if any such values won't expect it and interpret the value as 0. Thus we need to resend the types, if any such values
occur, and force resend for the next execution. occur, and force resend for the next execution.
*/ */
for (i = 0; i < stmt->param_count; i++) { for (i = 0; i < stmt->param_count; i++) {
if (Z_TYPE_P(stmt->param_bind[i].zv) != IS_NULL && if (Z_TYPE_P(stmt->param_bind[i].zv) != IS_NULL &&
@ -793,7 +792,6 @@ use_string:
data_size += Z_STRLEN_P(the_var); data_size += Z_STRLEN_P(the_var);
break; break;
} }
} }
/* 2.2 Enlarge the buffer, if needed */ /* 2.2 Enlarge the buffer, if needed */

1
ext/mysqlnd/mysqlnd_result.c
View file

@ -172,7 +172,6 @@ MYSQLND_METHOD(mysqlnd_res, unbuffered_free_last_data)(MYSQLND_RES * result TSRM
ctor_called_count, ctor_called_count,
STAT_COPY_ON_WRITE_SAVED, STAT_COPY_ON_WRITE_SAVED,
result->field_count - ctor_called_count); result->field_count - ctor_called_count);
/* Free last row's zvals */ /* Free last row's zvals */
mnd_efree(unbuf->last_row_data); mnd_efree(unbuf->last_row_data);
unbuf->last_row_data = NULL; unbuf->last_row_data = NULL;

1
ext/mysqlnd/mysqlnd_result_meta.c
View file

@ -224,7 +224,6 @@ MYSQLND_METHOD(mysqlnd_res_meta, read_metadata)(MYSQLND_RES_METADATA * const met
meta->bit_fields_total_len += 3;/* 120 */ meta->bit_fields_total_len += 3;/* 120 */
break; break;
} }
} }
#if MYSQLND_UNICODE #if MYSQLND_UNICODE