]> granicus.if.org Git - php/commitdiff
fixed report message
authorGeorg Richter <georg@php.net>
Mon, 23 Feb 2004 06:35:18 +0000 (06:35 +0000)
committerGeorg Richter <georg@php.net>
Mon, 23 Feb 2004 06:35:18 +0000 (06:35 +0000)
Disabled reconnect option

ext/mysqli/mysqli_api.c
ext/mysqli/mysqli_nonapi.c

index a05b6684db9d9b1f315bde412fc2978e99ef3eb0..f2aef1f786dcf70ab57667d66e838be240f671c7 100644 (file)
@@ -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));
index d34cf1717d0a2b9a2ebd24b76820c5a9ff13cbb3..3d1e6769a19f85eb6deda93cc61965b3a14a3ac3 100644 (file)
@@ -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;