Fix error message returned when a database cannot be opened. (CVS 1739)

FossilOrigin-Name: 440bfd2ac57d228d10913aca81ca8c6d7f38aa61

diff --git a/manifest b/manifest
index e01533737e3945033778e2fdd198b376afac6cab..7fd3dcbac4688cba0102f9aa43303810f65b23d1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\sfixes\srelated\sto\sthe\stests\sin\smisuse.test\s(CVS\s1738)
-D 2004-06-26T09:50:12
+C Fix\serror\smessage\sreturned\swhen\sa\sdatabase\scannot\sbe\sopened.\s(CVS\s1739)
+D 2004-06-26T10:02:16
 F Makefile.in cb7a9889c38723f72b2506c4236ff30a05ff172b
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -38,7 +38,7 @@ F src/hash.c 440c2f8cb373ee1b4e13a0988489c7cd95d55b6f
 F src/hash.h 762d95f1e567664d1eafc1687de755626be962fb
 F src/insert.c d99ffe87e1e1397f4233afcd06841d52d6b17b18
 F src/legacy.c ad23746f15f67e34577621b1875f639c94839e1f
-F src/main.c 7551892fd677fac1ddb1429f70bf53d7e01eeb93
+F src/main.c 37b6d15942b6d7b69b92686b32d6bae9d41a3e9b
 F src/md5.c 7ae1c39044b95de2f62e066f47bb1deb880a1070
 F src/os.h d1780e0db95cad01f213d48da22ab490eb4fd345
 F src/os_common.h ba1b7306e16e2091718f2c48db0fe6c1d7a31bb8
@@ -229,7 +229,7 @@ F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/version3.tcl 563ba3ac02f64da27ab17f3edbe8e56bfd0293fb
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 4e20720984e1fd6822ead785d758374d2704b7fb
-R 49b5250eaaec471bbc6b3f93826e25f5
+P 0af3ff39422e02afdfdaf2005ab5eb01b496dc72
+R 74fc53b1d0ec565dfae6b2c9c8d55906
 U danielk1977
-Z 797c0e00173b158ed66a18d7f85e63d1
+Z 2a622ffd85c9a9c2ded97785e4e9ce71

diff --git a/manifest.uuid b/manifest.uuid
index 55885af8fafaa8f89c4ec751d3871b2f077cdc29..5e80a2eeeaf022e4c6cdf39d96b7493637d966df 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0af3ff39422e02afdfdaf2005ab5eb01b496dc72
\ No newline at end of file
+440bfd2ac57d228d10913aca81ca8c6d7f38aa61
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 954e7ce2de2375e6240f8d2b46a568312a76b3bb..2ef573933afa596b99e3626cb07a9d0b3f388559 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $Id: main.c,v 1.235 2004/06/26 09:50:12 danielk1977 Exp $
+** $Id: main.c,v 1.236 2004/06/26 10:02:16 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -844,7 +844,10 @@ const char *sqlite3_errmsg(sqlite3 *db){
     */
     return sqlite3ErrStr(SQLITE_NOMEM);
   }
-  if( db->magic!=SQLITE_MAGIC_OPEN && db->magic!=SQLITE_MAGIC_BUSY ){
+  if( db->magic!=SQLITE_MAGIC_OPEN && 
+      db->magic!=SQLITE_MAGIC_BUSY &&
+      db->magic!=SQLITE_MAGIC_CLOSED 
+  ){
     return sqlite3ErrStr(SQLITE_MISUSE);
   }
   if( !sqlite3_value_text(db->pErr) ){