From: Georg Richter <georg@php.net>
Date: Tue, 8 Jun 2004 06:20:58 +0000 (+0000)
Subject: fixed crash (changed MYSQL TO MY_MYSQL in mysql_stmt_init)
X-Git-Tag: php-5.0.0~256
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=202d2990a98c983c971318f41ce928e580d1e5c2;p=php

fixed crash (changed MYSQL TO MY_MYSQL in mysql_stmt_init)
---

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 95b6fe4d88..237eabedb1 100644
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -1748,7 +1748,7 @@ PHP_FUNCTION(mysqli_stmt_error)
 */
 PHP_FUNCTION(mysqli_stmt_init)
 {
-	MYSQL			*mysql;
+	MY_MYSQL		*mysql;
 	MY_STMT 		*stmt;
 	zval			*mysql_link;
 	MYSQLI_RESOURCE *mysqli_resource; 
@@ -1756,11 +1756,11 @@ PHP_FUNCTION(mysqli_stmt_init)
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O",&mysql_link, mysqli_link_class_entry) == FAILURE) {
 		return;
 	}
-	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link");
+	MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link");
 
 	stmt = (MY_STMT *)ecalloc(1,sizeof(MY_STMT));
 
-	if (!(stmt->stmt = mysql_stmt_init(mysql))) {
+	if (!(stmt->stmt = mysql_stmt_init(mysql->mysql))) {
 		efree(stmt);
 		RETURN_FALSE;
 	}