Changeset 18609 for tmp/version-2_5-test/data/module/DB/odbc.php

Timestamp:

2010/03/11 10:35:11 (16 years ago)

Author:

kajiwara

Message:

正式版にナイトリービルド版をマージしてみるテスト

File:

• tmp/version-2_5-test/data/module/DB/odbc.php (modified) (4 diffs)

tmp/version-2_5-test/data/module/DB/odbc.php

@@ -19 +19 @@
  * @author     Stig Bakken <[email protected]>
  * @author     Daniel Convissor <[email protected]>
- * @copyright  1997-2005 The PHP Group
+ * @copyright  1997-2007 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
  * @version    CVS: $Id$
@@ -43 +43 @@
  * @author     Stig Bakken <[email protected]>
  * @author     Daniel Convissor <[email protected]>
- * @copyright  1997-2005 The PHP Group
+ * @copyright  1997-2007 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: @package_version@
+ * @version    Release: 1.7.14RC1
  * @link       http://pear.php.net/package/DB
  */
@@ -267 +267 @@
         // Determine which queries that should return data, and which
         // should return an error code only.
-        if (DB::isManip($query)) {
+        if ($this->_checkManip($query)) {
             $this->affected = $result; // For affectedRows()
             return DB_OK;
@@ -368 +368 @@
     function freeResult($result)
     {
-        return @odbc_free_result($result);
+        return is_resource($result) ? odbc_free_result($result) : false;
     }