scottmac Mon Jan 19 22:43:59 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src NEWS
/php-src/ext/sqlite3 sqlite3.c
Log:
Fixed bug #47141 - Unable to fetch error messages after the database can't be
opened.
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.465&r2=1.2027.2.547.2.965.2.466&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.465
php-src/NEWS:1.2027.2.547.2.965.2.466
--- php-src/NEWS:1.2027.2.547.2.965.2.465 Mon Jan 19 08:50:50 2009
+++ php-src/NEWS Mon Jan 19 22:43:57 2009
@@ -47,6 +47,8 @@
- Fixed building of pdo_sqlite without sqlite3. (Scott)
+- Fixed bug #47141 (Unable to fetch error messages from SQLite
+ when the database can't be opened). (Scott)
- Fixed bug #47050 (mysqli_poll() modifies improper variables). (Johannes)
- Fixed bug #47045 (SplObjectStorage instances compared with ==). (Etienne)
- Fixed bug #46979 (use with non-compound name *has* effect). (Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.1.2.25&r2=1.1.2.26&diff_format=u
Index: php-src/ext/sqlite3/sqlite3.c
diff -u php-src/ext/sqlite3/sqlite3.c:1.1.2.25
php-src/ext/sqlite3/sqlite3.c:1.1.2.26
--- php-src/ext/sqlite3/sqlite3.c:1.1.2.25 Sun Jan 4 16:31:12 2009
+++ php-src/ext/sqlite3/sqlite3.c Mon Jan 19 22:43:58 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sqlite3.c,v 1.1.2.25 2009/01/04 16:31:12 iliaa Exp $ */
+/* $Id: sqlite3.c,v 1.1.2.26 2009/01/19 22:43:58 scottmac Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -229,7 +229,7 @@
zval *object = getThis();
db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object
TSRMLS_CC);
- SQLITE3_CHECK_INITIALIZED(db_obj->initialised, SQLite3)
+ SQLITE3_CHECK_INITIALIZED(db_obj->db, SQLite3)
if (zend_parse_parameters_none() == FAILURE) {
return;
@@ -247,7 +247,7 @@
zval *object = getThis();
db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object
TSRMLS_CC);
- SQLITE3_CHECK_INITIALIZED(db_obj->initialised, SQLite3)
+ SQLITE3_CHECK_INITIALIZED(db_obj->db, SQLite3)
if (zend_parse_parameters_none() == FAILURE) {
return;
@@ -943,7 +943,7 @@
}
if (sqlite3_clear_bindings(stmt_obj->stmt) != SQLITE_OK) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to execute
statement: %s", sqlite3_errmsg(sqlite3_db_handle(stmt_obj->stmt)));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to clear
statement: %s", sqlite3_errmsg(sqlite3_db_handle(stmt_obj->stmt)));
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
