[PHP-CVS] cvs: php-src /ext/mysqli mysqli_api.c mysqli_nonapi.c

[Georg Richter]

georg           Mon Feb 23 01:35:18 2004 EDT

  Modified files:              
    /php-src/ext/mysqli mysqli_api.c mysqli_nonapi.c 
  Log:
  fixed report message
  Disabled reconnect option
  
  
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.73&r2=1.74&ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.73 php-src/ext/mysqli/mysqli_api.c:1.74
--- php-src/ext/mysqli/mysqli_api.c:1.73        Fri Feb 20 08:09:14 2004
+++ php-src/ext/mysqli/mysqli_api.c     Mon Feb 23 01:35:18 2004
@@ -15,7 +15,7 @@
   | Author: Georg Richter <[EMAIL PROTECTED]>                                |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_api.c,v 1.73 2004/02/20 13:09:14 georg Exp $ 
+  $Id: mysqli_api.c,v 1.74 2004/02/23 06:35:18 georg Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -1271,6 +1271,8 @@
                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 @@
                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 @@
        }
 
        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));
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.29&r2=1.30&ty=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.29 php-src/ext/mysqli/mysqli_nonapi.c:1.30
--- php-src/ext/mysqli/mysqli_nonapi.c:1.29     Wed Jan 28 17:51:54 2004
+++ php-src/ext/mysqli/mysqli_nonapi.c  Mon Feb 23 01:35:18 2004
@@ -15,7 +15,7 @@
   | Author: Georg Richter <[EMAIL PROTECTED]>                                |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_nonapi.c,v 1.29 2004/01/28 22:51:54 georg Exp $ 
+  $Id: mysqli_nonapi.c,v 1.30 2004/02/23 06:35:18 georg Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -83,6 +83,8 @@
        /* 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;
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php