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

[Georg Richter]

georg           Sat Dec 13 11:08:14 2003 EDT

  Modified files:              
    /php-src/ext/mysqli mysqli_api.c mysqli_nonapi.c 
  Log:
  minor fixes for embedded
  
  
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.53 php-src/ext/mysqli/mysqli_api.c:1.54
--- php-src/ext/mysqli/mysqli_api.c:1.53        Sat Dec 13 08:44:56 2003
+++ php-src/ext/mysqli/mysqli_api.c     Sat Dec 13 11:08:13 2003
@@ -15,7 +15,7 @@
   | Author: Georg Richter <[EMAIL PROTECTED]>                                |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_api.c,v 1.53 2003/12/13 13:44:56 helly Exp $ 
+  $Id: mysqli_api.c,v 1.54 2003/12/13 16:08:13 georg Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -936,7 +936,7 @@
        }
        MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link");
 
-       RETURN_STRING((char *)mysql_get_host_info(mysql), 1);
+       RETURN_STRING((mysql->host_info) ? mysql->host_info : empty_string, 1);
 }
 /* }}} */
 
@@ -995,7 +995,6 @@
 PHP_FUNCTION(mysqli_info)
 {
        MYSQL           *mysql;
-       char            *info = NULL;
        zval            *mysql_link = NULL;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", 
&mysql_link, mysqli_link_class_entry) == FAILURE) {
@@ -1003,11 +1002,7 @@
        }
        MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link");
 
-       if (!(info = (char *)mysql_info(mysql))) {
-               RETURN_FALSE;
-       }
-
-       RETURN_STRING(info, 1);
+       RETURN_STRING((mysql->info) ? mysql->info : empty_string, 1);
 }
 /* }}} */
 
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.23 php-src/ext/mysqli/mysqli_nonapi.c:1.24
--- php-src/ext/mysqli/mysqli_nonapi.c:1.23     Sat Dec 13 08:44:56 2003
+++ php-src/ext/mysqli/mysqli_nonapi.c  Sat Dec 13 11:08:13 2003
@@ -15,7 +15,7 @@
   | Author: Georg Richter <[EMAIL PROTECTED]>                                |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_nonapi.c,v 1.23 2003/12/13 13:44:56 helly Exp $ 
+  $Id: mysqli_nonapi.c,v 1.24 2003/12/13 16:08:13 georg Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -116,8 +116,12 @@
        mysql = mysql_init(NULL);
 
        if (mysql_real_connect(mysql, NULL, NULL, NULL, dbname, 0, NULL, 0) == NULL) {
+               MYSQLI_REPORT_MYSQL_ERROR(mysql);
                php_mysqli_set_error(mysql_errno(mysql), (char *) mysql_error(mysql) 
TSRMLS_CC);
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", mysql_error(mysql));
+
+               if (!(MyG(report_mode) & MYSQLI_REPORT_ERROR)) {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", 
mysql_error(mysql));
+               }
                /* free mysql structure */
                mysql_close(mysql);
                RETURN_FALSE;

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