summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeyur Govande <keyur@php.net>2015-01-26 21:38:43 +0000
committerKeyur Govande <keyur@php.net>2015-01-26 21:38:43 +0000
commitf41d58efa0e5284c886f3048fc4c4cbe11c64d5c (patch)
tree86c2b1e15b9940b20d8cc23e0d622a102aebd35b
parent6635466bccef32bb34c4834302585860ce111968 (diff)
downloadphp-git-f41d58efa0e5284c886f3048fc4c4cbe11c64d5c.tar.gz
Fix bad merge
-rw-r--r--ext/mysqli/mysqli_api.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 7e6ad66d4d..f811a22943 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);