From b3979e76bac985102a1a7eb710da0b02b15e1459 Mon Sep 17 00:00:00 2001 From: Georg Richter Date: Mon, 23 Feb 2004 06:35:18 +0000 Subject: [PATCH] fixed report message Disabled reconnect option --- ext/mysqli/mysqli_api.c | 6 ++++-- ext/mysqli/mysqli_nonapi.c | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index a05b6684db..f2aef1f786 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -1271,6 +1271,8 @@ PHP_FUNCTION(mysqli_real_connect) RETURN_FALSE; } php_mysqli_set_error(mysql_errno(mysql), (char *)mysql_error(mysql) TSRMLS_CC); + + mysql->reconnect = 0; if (object) { ((mysqli_object *) zend_object_store_get_object(object TSRMLS_CC))->valid = 1; @@ -1658,7 +1660,7 @@ PHP_FUNCTION(mysqli_store_result) RETURN_FALSE; } if (MyG(report_mode) & MYSQLI_REPORT_INDEX) { - php_mysqli_report_index("from previous mysql_real_connect", mysql->server_status TSRMLS_CC); + php_mysqli_report_index("from previous query", mysql->server_status TSRMLS_CC); } MYSQLI_DISABLE_MQ; mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE)); @@ -1713,7 +1715,7 @@ PHP_FUNCTION(mysqli_use_result) } if (MyG(report_mode) & MYSQLI_REPORT_INDEX) { - php_mysqli_report_index("from previous mysql_real_connect", mysql->server_status TSRMLS_CC); + php_mysqli_report_index("from previous query", mysql->server_status TSRMLS_CC); } mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE)); diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index d34cf1717d..3d1e6769a1 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -83,6 +83,8 @@ PHP_FUNCTION(mysqli_connect) /* clear error */ php_mysqli_set_error(mysql_errno(mysql), (char *) mysql_error(mysql) TSRMLS_CC); + mysql->reconnect = 0; + mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE)); mysqli_resource->ptr = (void *)mysql; -- 2.50.1