com php-src: Fix bad merge: ext/mysqli/mysqli_api.c

Commit: f41d58efa0e5284c886f3048fc4c4cbe11c64d5c Author: Keyur Govande <keyur@php.net> Mon, 26 Jan 2015 21:38:43 +0000 Parents: 6635466bccef32bb34c4834302585860ce111968 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f41d58efa0e5284c886f3048fc4c4cbe11c64d5c Log: Fix bad merge Changed paths: M ext/mysqli/mysqli_api.c Diff: diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 7e6ad66..f811a22 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -425,16 +425,6 @@ mysqli_stmt_bind_result_do_bind(MY_STMT *stmt, zval *args, unsigned int argc, un 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: convert_to_double_ex(args[i]); stmt->result.buf[ofs].type = IS_DOUBLE; stmt->result.buf[ofs].buflen = sizeof(double);