archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 17:34:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix bad merge

Browse source
This commit is contained in:
Keyur Govande 2015-01-26 21:38:43 +00:00
parent 6635466bcc
commit f41d58efa0
1 changed files with 0 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ext/mysqli/mysqli_api.c
View file

@ -424,16 +424,6 @@ mysqli_stmt_bind_result_do_bind(MY_STMT *stmt, zval *args, unsigned int argc, un
bind[ofs].is_null = &stmt->result.is_null[ofs]; bind[ofs].is_null = &stmt->result.is_null[ofs];
break; break;
case MYSQL_TYPE_DOUBLE:
stmt->result.buf[ofs].type = IS_DOUBLE;
stmt->result.buf[ofs].buflen = sizeof(float);
stmt->result.buf[ofs].val = (char *)emalloc(sizeof(float));
bind[ofs].buffer_type = MYSQL_TYPE_FLOAT;
bind[ofs].buffer = stmt->result.buf[ofs].val;
bind[ofs].is_null = &stmt->result.is_null[ofs];
break;
case MYSQL_TYPE_DOUBLE: case MYSQL_TYPE_DOUBLE:
convert_to_double_ex(args[i]); convert_to_double_ex(args[i]);
stmt->result.buf[ofs].type = IS_DOUBLE; stmt->result.buf[ofs].type = IS_DOUBLE;