diff --git a/manifest b/manifest
index ea87877793..648a6feefe 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sperformance\sregression\sintroduced\swhile\sreworking\sthe\sfts3\scode.
-D 2009-11-19T18:28:45
+C Merge\sleaves\s[7cd178a72a]\sand\s[598727e6da].
+D 2009-11-19T18:30:14
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 7f6c6aa7feeeb5e26e01b344161d9aa1b5d64177
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -116,7 +116,7 @@ F src/callback.c 908f3e0172c3d4058f4ca0acd42c637c52e9669f
 F src/complete.c 417df1ef5ea798532bb6290b0cc4265fef82980a
 F src/date.c a79c0a8f219370b972e320741f995a3bef9df33f
 F src/delete.c ec04635d152debdab70d4b30c5516b59282075ea
-F src/expr.c be7f3db3e3b57f1f66f7a2acc445e8cb03fbd5a5
+F src/expr.c bd248461bfb8290e3bb1da668660d42ab1a75464
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 F src/fkey.c e2116672a6bd610dc888e27df292ebc7999c9bb0
 F src/func.c bf54e1202cbfb28bf4b1fd9b58899009ae76716f
@@ -772,7 +772,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 551dbe30eab5855756e6356f6ba050f5d1791ef8
-R f7b891b4bcfc7c759749c61f9eb643c5
+P 7cd178a72ab99c94fdacffb19aad819ae600e57d 598727e6dae87f133c658fa125684f6ad978be60
+R fa3f77e1031f7ddfc32b18ebcb9c7d5a
 U dan
-Z 8e0de62e656b56f2e53230487feca6ce
+Z 98edfed95630a7f71d24a5499ccf87bc
diff --git a/manifest.uuid b/manifest.uuid
index 91ca6d099e..573dbc00c3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7cd178a72ab99c94fdacffb19aad819ae600e57d
\ No newline at end of file
+4115c0c286052e32cb81f77a644d530c1766206f
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index fbb456f895..5254cd7157 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -1336,8 +1336,9 @@ int sqlite3ExprNeedsNoAffinityChange(const Expr *p, char aff){
       return 1;
     }
     case TK_COLUMN: {
-      return p->iTable>=0 && p->iColumn<0
-               && (aff==SQLITE_AFF_INTEGER || aff==SQLITE_AFF_NUMERIC);
+      assert( p->iTable>=0 );  /* p cannot be part of a CHECK constraint */
+      return p->iColumn<0
+          && (aff==SQLITE_AFF_INTEGER || aff==SQLITE_AFF_NUMERIC);
     }
     default: {
       return 0;