From 6d4486ae9f6679e01d8648c5351dff8465879fb8 Mon Sep 17 00:00:00 2001 From: drh Date: Wed, 23 Sep 2009 14:45:05 +0000 Subject: [PATCH] Change the version number to 3.6.19. Fix a couple of incorrect testcase() macros associated with the new IS and IS NOT operators in expr.c. FossilOrigin-Name: e3b73394bf9c0391e997079b160eace3589415ab --- VERSION | 2 +- manifest | 26 ++++++++++++++++++-------- manifest.uuid | 2 +- src/expr.c | 4 ++-- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/VERSION b/VERSION index c241e9602d..33e5103004 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.6.18 +3.6.19 diff --git a/manifest b/manifest index 53bde60a33..7d35e4e0df 100644 --- a/manifest +++ b/manifest @@ -1,11 +1,14 @@ -C Disallow\susing\sthe\simplicit\srowid\scolumn\sas\sthe\sparent\skey\sof\san\sFK\sconstraint. -D 2009-09-23T13:59:17 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +C Change\sthe\sversion\snumber\sto\s3.6.19.\s\sFix\sa\scouple\sof\sincorrect\stestcase()\nmacros\sassociated\swith\sthe\snew\sIS\sand\sIS\sNOT\soperators\sin\sexpr.c. +D 2009-09-23T14:45:06 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 4ca3f1dd6efa2075bcb27f4dc43eef749877740d F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F Makefile.vxworks 10010ddbf52e2503c7c49c7c0b7c7a096f8638a6 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6 -F VERSION 7260e7baf934051dee42458206e915b75570f41d +F VERSION d9975ec88922e61343caeae3bf09859012851f2f F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50 F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531 F art/2005osaward.gif 0d1851b2a7c1c9d0ccce545f3e14bca42d7fd248 @@ -114,7 +117,7 @@ F src/callback.c 10d237171472865f58fb07d515737238c9e06688 F src/complete.c 5ad5c6cd4548211867c204c41a126d73a9fbcea0 F src/date.c 657ff12ca0f1195b531561afacbb38b772d16638 F src/delete.c 15499f5d10047d38e68ce991b3f88cbddb6e0931 -F src/expr.c 8a663240f374a5326ee157df3d27751f58b7676a +F src/expr.c c7f3f718bd5c392344ec8694a41c1824f30cf375 F src/fault.c dc88c821842157460750d2d61a8a8b4197d047ff F src/fkey.c 9a0afe076ce51552ce00ab0f730213798bf75720 F src/func.c e536218d193b8d326aab91120bc4c6f28aa2b606 @@ -753,7 +756,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P 101ed58cf4a1dfe53031b98cfc7ed01e86b4c7b6 -R b46a4f5afd3ba101cf0c76c3fa2edc83 -U dan -Z 033b8b51f2009360e4a4d40c8021977a +P a5f7e71f424900071a3925e53e9128c9148ea2e8 +R 1cf160be224098f65d5a40f70510798c +U drh +Z ba0492734ae062ad6f96686c1eaa9cb5 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQFKujR5oxKgR168RlERAiKLAKCM34z0rE9AqFSmh+8DaMHmm41TYwCfU4DR +G2ZVc7tQFSK/VvZxNO4smJg= +=RbX3 +-----END PGP SIGNATURE----- diff --git a/manifest.uuid b/manifest.uuid index a21055bcff..0f42432abc 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -a5f7e71f424900071a3925e53e9128c9148ea2e8 \ No newline at end of file +e3b73394bf9c0391e997079b160eace3589415ab \ No newline at end of file diff --git a/src/expr.c b/src/expr.c index 998bf41a80..06db149016 100644 --- a/src/expr.c +++ b/src/expr.c @@ -3195,8 +3195,8 @@ void sqlite3ExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int jumpIfNull){ } case TK_IS: case TK_ISNOT: { - testcase( op==TK_IS ); - testcase( op==TK_ISNOT ); + testcase( pExpr->op==TK_IS ); + testcase( pExpr->op==TK_ISNOT ); codeCompareOperands(pParse, pExpr->pLeft, &r1, ®Free1, pExpr->pRight, &r2, ®Free2); op = (pExpr->op==TK_IS) ? TK_NE : TK_EQ; -- 2.47.2