From: drh <drh@noemail.net>
Date: Sun, 21 Aug 2005 17:48:46 +0000 (+0000)
Subject: Do not create an error message if there is no error. (CVS 2607)
X-Git-Tag: version-3.6.10~3552
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=130b9f4040ff8fe2d51a491feb98e11924dd0765;p=thirdparty%2Fsqlite.git

Do not create an error message if there is no error. (CVS 2607)

FossilOrigin-Name: 3aa47c5587819a5fc3e2cb53a7fbc79ba65f0c3b
---

diff --git a/manifest b/manifest
index cd757fcb70..c5cd08c2a3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\soverwrite\ssmall\sfiles\s(less\sthan\s1024\sbytes)\sthat\sare\snot\sdatabases.\nTicket\s#1370.\s(CVS\s2606)
-D 2005-08-21T16:54:25
+C Do\snot\screate\san\serror\smessage\sif\sthere\sis\sno\serror.\s(CVS\s2607)
+D 2005-08-21T17:48:47
 F Makefile.in b109ddb46a5550d0732dcd6caca01c123f6d5cdd
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -83,7 +83,7 @@ F src/vacuum.c 829d9e1a6d7c094b80e0899686670932eafd768c
 F src/vdbe.c 69f33e22c7d0a64b23fbb69e6da95a1bb6869032
 F src/vdbe.h 3b29a9af6c7a64ed692bef1fc5f61338f40d2f67
 F src/vdbeInt.h 9be9a6c43d38124bd03cc5cf05715605b1789fd9
-F src/vdbeapi.c dc5b78cabf8d6e33318bd3d4ed25307d2aadce9a
+F src/vdbeapi.c 7790e9f8da2dde29510a196d1e41ff53da7eb8a8
 F src/vdbeaux.c 874624698fad54a59c6a0bcccea9d5aaa8655ab6
 F src/vdbefifo.c b8805850afe13b43f1de78d58088cb5d66f88e1e
 F src/vdbemem.c 4732fd4d1a75dc38549493d7f9a81d02bf7c59b5
@@ -297,7 +297,7 @@ F www/tclsqlite.tcl 3df553505b6efcad08f91e9b975deb2e6c9bb955
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P e559e810a51427def6928763ae0d6f7347366d04
-R 184bcceb8c1c2233bdc023bc940ab136
+P 7f4302686e55f22b281d98a8a3b89300f4ce4eb6
+R 99f431248345c07efd706bf5e546af2d
 U drh
-Z f67ee3ee1747fb9c945328153fe78418
+Z c0a644bf7151c7c7ba20f247f8e159f8
diff --git a/manifest.uuid b/manifest.uuid
index 0e4a6f2742..69d67fffc9 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7f4302686e55f22b281d98a8a3b89300f4ce4eb6
\ No newline at end of file
+3aa47c5587819a5fc3e2cb53a7fbc79ba65f0c3b
\ No newline at end of file
diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index 1097bb45b9..776e227616 100644
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -213,7 +213,7 @@ int sqlite3_step(sqlite3_stmt *pStmt){
     rc = SQLITE_MISUSE;
   }
 
-  sqlite3Error(p->db, rc, "%s", p->zErrMsg);
+  sqlite3Error(p->db, rc, p->zErrMsg ? "%s" : 0, p->zErrMsg);
   return rc;
 }