summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeyur Govande <keyur@php.net>2015-01-26 21:44:14 +0000
committerKeyur Govande <keyur@php.net>2015-01-26 21:44:14 +0000
commit5f3dbab0fa67fac449e6139e3e38f942e3ef979a (patch)
tree44054b8fc03657c1d1fcbd656c2ec3d338df4aa2
parentf41d58efa0e5284c886f3048fc4c4cbe11c64d5c (diff)
downloadphp-git-5f3dbab0fa67fac449e6139e3e38f942e3ef979a.tar.gz
One more bad merge fix
-rw-r--r--ext/mysqli/mysqli_api.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index f811a22943..9f6d8220ce 100644
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -425,7 +425,6 @@ mysqli_stmt_bind_result_do_bind(MY_STMT *stmt, zval *args, unsigned int argc, un
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);