[Phpgroupware-cvs] phpgwapi/inc/class.db_mysql.inc.php, 1.41

[nomail]

Update of /phpgwapi/inc
Modified Files:
        Branch: 
          class.db_mysql.inc.php

date: 2004/05/27 04:56:27;  author: skwashd;  state: Exp;  lines: +22 -18

Log Message:
merging 16 changes
=====================================================================
Index: phpgwapi/inc/class.db_mysql.inc.php
diff -u phpgwapi/inc/class.db_mysql.inc.php:1.40 
phpgwapi/inc/class.db_mysql.inc.php:1.41
--- phpgwapi/inc/class.db_mysql.inc.php:1.40    Thu Nov 13 17:08:36 2003
+++ phpgwapi/inc/class.db_mysql.inc.php Thu May 27 04:56:27 2004
@@ -1,22 +1,23 @@
 <?php
-       /* do not put tabs inside the header info!!! */
-       
/***********************************************************************\
-       * phpGroupWare - API - Database Abstraction                             
*
-       * http://www.phpgroupware.org                                           
*
-       * This program is part of the GNU project, see http://www.gnu.org/      
*
-       *                                                                       
*
-       * Portions Copyright 2001, 2002, 2003 Free Software Foundation, Inc.    
*
-       * Based on phplib - Copyright 1998-2000 NetUSE AG,                      
* 
-       *                       Boris Erdmann, Kristian Koehntopp               
            *
-       * Contributions from Dan Kuykendall, Michael Dean, Dave Hall and others 
*
-       * --------------------------------------------------------------------- 
*
-       *  This program is Free Software; you can redistribute it and/or        
*
-       *  modify it under the terms of the GNU Lesser General Public License   
*
-       *  as published by the Free Software Foundation; either version 2.1 of  
*
-       *  the License, or (at your option) any later version.                  
*
-       
\***********************************************************************/
-       /* $Id$ */
-
+       /**
+       * Database class for MySQL
+       * @author NetUSE AG Boris Erdmann, Kristian Koehntopp
+       * @author Dan Kuykendall, Dave Hall and others
+       * @copyright Copyright (C) 1998-2000 NetUSE AG Boris Erdmann, Kristian 
Koehntopp
+       * @copyright Portions Copyright (C) 2001-2004 Free Software Foundation, 
Inc. http://www.fsf.org/
+       * @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General 
Public License
+       * @link http://www.sanisoft.com/phplib/manual/DB_sql.php
+       * @package phpgwapi
+       * @subpackage database
+       * @version $Id$
+       */
+
+       /**
+       * Database class for MySQL
+       * 
+       * @package phpgwapi
+       * @subpackage database
+       */
        class db extends db_
        {
                /* public: this is an api revision, not a CVS revision. */
@@ -69,6 +70,7 @@
                                if (address@hidden($Database,$this->Link_ID))
                                {
                                        $this->halt("cannot use database 
".$this->Database);
+                                       $this->disconnect();
                                        return 0;
                                }
                        }
@@ -124,6 +126,8 @@
                        }
                        if (!$this->connect())
                        {
+                               $this->Errno = @mysql_errno();
+                               $this->Error = @mysql_error();
                                return 0; /* we already complained in connect() 
about that. */
                        };