From: drh <drh@noemail.net>
Date: Thu, 21 Jun 2012 17:21:52 +0000 (+0000)
Subject: Remove code that was incorrectly changing SQLITE_MISUSE errors into SQLITE_OK
X-Git-Tag: version-3.7.14~72
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5afbd60a1d75de447049d34293ac2826b66f37d0;p=thirdparty%2Fsqlite.git

Remove code that was incorrectly changing SQLITE_MISUSE errors into SQLITE_OK
in sqlite3_finalize().

FossilOrigin-Name: d5e6880279210ca63e2d5e7f6d009f30566f1242
---

diff --git a/manifest b/manifest
index 3103353fbf..54253a585a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\ssqlite3_close_v2()\sinterface\s(from\sthe\sdeferred-close\sbranch)\sthat\nallows\sclose\soperations\sto\shappen\sout-of-order\sin\sbindings\sto\ngarbage-collected\slangauges.
-D 2012-06-21T15:51:42.711
+C Remove\scode\sthat\swas\sincorrectly\schanging\sSQLITE_MISUSE\serrors\sinto\sSQLITE_OK\nin\ssqlite3_finalize().
+D 2012-06-21T17:21:52.202
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 8f6d858bf3df9978ba43df19985146a1173025e4
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -240,7 +240,7 @@ F src/vacuum.c 587a52bb8833d7ac15af8916f25437e2575028bd
 F src/vdbe.c f5ad3c06dc3fe647097065829c013f3f1b9eadca
 F src/vdbe.h 18f581cac1f4339ec3299f3e0cc6e11aec654cdb
 F src/vdbeInt.h 6ff4180a05683566a8835d12f7ec504b22932c82
-F src/vdbeapi.c f8ba09132fe654ffd068058cef490426aca9fca6
+F src/vdbeapi.c 88ea823bbcb4320f5a6607f39cd7c2d3cc4c26b1
 F src/vdbeaux.c dce80038c3c41f2680e5ab4dd0f7e0d8b7ff9071
 F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
 F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
@@ -1004,7 +1004,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 4cebd60704f92bb3689c126f46feadc3516d3d45 37d9bc061d5ecfe37ccbd6f559986d7ae0449179
-R 41d5610ed2033955b4202ff788697dde
+P fb8893abeefabe9de44e34dcf4327764481189f5
+R 1407ab77c9d83dad7f51ec0e9878a545
 U drh
-Z c18db60333d2fd8d859babd08906006b
+Z f514219a89248d947572eba2b55a152c
diff --git a/manifest.uuid b/manifest.uuid
index 9e7abc1ff8..7b21713036 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fb8893abeefabe9de44e34dcf4327764481189f5
\ No newline at end of file
+d5e6880279210ca63e2d5e7f6d009f30566f1242
\ No newline at end of file
diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index e25acd9449..b9a88a6ab8 100644
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -74,7 +74,6 @@ int sqlite3_finalize(sqlite3_stmt *pStmt){
     if( vdbeSafety(v) ) return SQLITE_MISUSE_BKPT;
     sqlite3_mutex_enter(db->mutex);
     rc = sqlite3VdbeFinalize(v);
-    if( (rc&0xff)==SQLITE_MISUSE ) rc = SQLITE_OK;
     rc = sqlite3ApiExit(db, rc);
     sqlite3LeaveMutexAndCloseZombie(db);
   }