From: drh <drh@noemail.net>
Date: Wed, 24 Jun 2009 13:16:03 +0000 (+0000)
Subject: Remove an ALWAYS() macro from vdbe.c that sometimes fails on thread tests. (CVS 6812)
X-Git-Tag: cvs-to-fossil-cutover~160
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=46bbabd9597830dd5a5e5f9b709628a8ec3012fe;p=thirdparty%2Fsqlite.git

Remove an ALWAYS() macro from vdbe.c that sometimes fails on thread tests. (CVS 6812)

FossilOrigin-Name: 52eac078c7080519911599e19819cbec475de6d6
---

diff --git a/manifest b/manifest
index 8226e59a07..284e3450f8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Disable\sthe\snew\smalloc-37\stest\swhen\slocking_mode==exclusive.\s\sThe\stest\nbasically\sworks,\sbut\ssometimes\sreports\s"database\sis\slocked"\sinstead\sof\n"out\sof\smemory"\sand\sthat\smesses\sup\sthe\serror\sreporting.\s(CVS\s6811)
-D 2009-06-24T13:13:45
+C Remove\san\sALWAYS()\smacro\sfrom\svdbe.c\sthat\ssometimes\sfails\son\sthread\stests.\s(CVS\s6812)
+D 2009-06-24T13:16:04
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 8b8fb7823264331210cddf103831816c286ba446
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -203,7 +203,7 @@ F src/update.c b58db45e40f11082281d6f94137cd3b5657771d9
 F src/utf.c 9541d28f40441812c0b40f00334372a0542c00ff
 F src/util.c 861d5b5c58be4921f0a254489ea94cb15f550ef8
 F src/vacuum.c 0e14f371ea3326c6b8cfba257286d798cd20db59
-F src/vdbe.c 5337789f2b481281ec74e6fc0385cf544e074e2b
+F src/vdbe.c 5c4a595077338752245dc51d34ad6c3c47194d96
 F src/vdbe.h 35a648bc3279a120da24f34d9a25213ec15daf8a
 F src/vdbeInt.h 831c254a6eef237ef4664c8381a0137586567007
 F src/vdbeapi.c 73bd1d2c57b953bc688d1d8c84b24c2084c2aec7
@@ -737,7 +737,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P ee20b6a23fa4a4ec4d3a2d0dcfcabff466f08246
-R 0331d4b5d6812279677260dc45e88b22
+P 3b8f9dec24d06865455a75587bbfc199c19c6215
+R 420b3ba279f0ef4dc395350d7f56e7a5
 U drh
-Z 57f4b55306ec2a2991e394a845e2f814
+Z f0691dda6c10f296a0eff99d0e104f07
diff --git a/manifest.uuid b/manifest.uuid
index 108eb44368..31f2cb4252 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3b8f9dec24d06865455a75587bbfc199c19c6215
\ No newline at end of file
+52eac078c7080519911599e19819cbec475de6d6
\ No newline at end of file
diff --git a/src/vdbe.c b/src/vdbe.c
index 0379131907..c13c8685cb 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -43,7 +43,7 @@
 ** in this file for details.  If in doubt, do not deviate from existing
 ** commenting and indentation practices when changing or adding code.
 **
-** $Id: vdbe.c,v 1.862 2009/06/23 14:15:04 drh Exp $
+** $Id: vdbe.c,v 1.863 2009/06/24 13:16:04 drh Exp $
 */
 #include "sqliteInt.h"
 #include "vdbeInt.h"
@@ -4498,7 +4498,7 @@ case OP_ParseSchema: {
   */
   assert( sqlite3BtreeHoldsMutex(db->aDb[iDb].pBt) );
   sqlite3BtreeEnterAll(db);
-  if( pOp->p2 || ALWAYS(DbHasProperty(db, iDb, DB_SchemaLoaded)) ){
+  if( pOp->p2 || DbHasProperty(db, iDb, DB_SchemaLoaded) ){
     zMaster = SCHEMA_TABLE(iDb);
     initData.db = db;
     initData.iDb = pOp->p1;