[PHP-CVS] cvs: php-src /ext/pdo pdo_dbh.c php_pdo_driver.h

[Antony Dovgal]

tony2001                Wed Feb  1 09:10:23 2006 UTC

  Modified files:              
    /php-src/ext/pdo    pdo_dbh.c php_pdo_driver.h 
  Log:
  fix build
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.109&r2=1.110&diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.109 php-src/ext/pdo/pdo_dbh.c:1.110
--- php-src/ext/pdo/pdo_dbh.c:1.109     Tue Jan 31 17:21:25 2006
+++ php-src/ext/pdo/pdo_dbh.c   Wed Feb  1 09:10:23 2006
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: pdo_dbh.c,v 1.109 2006/01/31 17:21:25 iliaa Exp $ */
+/* $Id: pdo_dbh.c,v 1.110 2006/02/01 09:10:23 tony2001 Exp $ */
 
 /* The PDO Database Handle Class */
 
@@ -72,7 +72,7 @@
        if (dbh->error_mode != PDO_ERRMODE_EXCEPTION) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", message);
        } else {
-               zval *ex, info;
+               zval *ex, *info;
                zend_class_entry *def_ex = php_pdo_get_exception_base(1 
TSRMLS_CC), *pdo_ex = php_pdo_get_exception(TSRMLS_C);
 
                MAKE_STD_ZVAL(ex);
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo/php_pdo_driver.h?r1=1.73&r2=1.74&diff_format=u
Index: php-src/ext/pdo/php_pdo_driver.h
diff -u php-src/ext/pdo/php_pdo_driver.h:1.73 
php-src/ext/pdo/php_pdo_driver.h:1.74
--- php-src/ext/pdo/php_pdo_driver.h:1.73       Sun Jan  1 13:09:52 2006
+++ php-src/ext/pdo/php_pdo_driver.h    Wed Feb  1 09:10:23 2006
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: php_pdo_driver.h,v 1.73 2006/01/01 13:09:52 sniper Exp $ */
+/* $Id: php_pdo_driver.h,v 1.74 2006/02/01 09:10:23 tony2001 Exp $ */
 
 #ifndef PHP_PDO_DRIVER_H
 #define PHP_PDO_DRIVER_H
@@ -489,6 +489,13 @@
        zend_class_entry *def_stmt_ce;
        
        zval *def_stmt_ctor_args;
+    
+       /* when calling PDO::query(), we need to keep the error
+        * context from the statement around until we next clear it.
+        * This will allow us to report the correct error message
+        * when PDO::query() fails */
+       pdo_stmt_t *query_stmt;
+       zval query_stmt_zval;
 };
 
 /* describes a column */

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