com php-src: One more bad merge fix: ext/mysqli/mysqli_api. c
| From: | Keyur Govande | Date: | Mon, 26 Jan 2015 21:44:14 +0000 |
| Subject: | com php-src: One more bad merge fix: ext/mysqli/mysqli_api. c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84379@lists.php.net to get a copy of this message | ||
Commit: 5f3dbab0fa67fac449e6139e3e38f942e3ef979a
Author: Keyur Govande <keyur@php.net> Mon, 26 Jan 2015 21:44:14 +0000
Parents: f41d58efa0e5284c886f3048fc4c4cbe11c64d5c
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5f3dbab0fa67fac449e6139e3e38f942e3ef979a
Log:
One more bad merge fix
Changed paths:
M ext/mysqli/mysqli_api.c
Diff:
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index f811a22..9f6d822 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);