Fix the comment on the sqlite3PExpr() subroutine. Ticket #3924. (CVS 6789)

FossilOrigin-Name: 4bb96db6b4d2cfa71430a2646c1082a494e3519f

diff --git a/manifest b/manifest
index 670096661c69f5925e801ac5a66483e5d9a097ad..07ef76f2483bfc05f104f92c8f394bd2289e1e43 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C If\sa\scall\sis\smade\sto\ssqlite3PagerAcquire\swhen\sthere\sare\sno\soutstanding\sreferences\sto\sany\spages\sand\sthe\spager\sis\sin\sthe\serror-state,\stry\sto\sexit\sthe\serror-state\sat\sthis\spoint.\sPreviously\sthis\swas\sonly\sattempted\sif\sthe\spager\swas\sconfigured\sto\suse\sexclusive\smode.\s(CVS\s6788)
-D 2009-06-19T17:50:02
+C Fix\sthe\scomment\son\sthe\ssqlite3PExpr()\ssubroutine.\s\sTicket\s#3924.\s(CVS\s6789)
+D 2009-06-19T18:32:55
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 8b8fb7823264331210cddf103831816c286ba446
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -114,7 +114,7 @@ F src/callback.c cb68b21b0d4ae7d11ae0e487933bce3323784dcf
 F src/complete.c 5ad5c6cd4548211867c204c41a126d73a9fbcea0
 F src/date.c ab5f7137656652a48434d64f96bdcdc823bb23b3
 F src/delete.c cb791855c7948cecc96def9d97989879ca26f257
-F src/expr.c 1d580a7b2e51092785cbbc1fb8d2ff84e93c76dc
+F src/expr.c de80e2d6c2adc453e06f070837ca5b87d4373730
 F src/fault.c dc88c821842157460750d2d61a8a8b4197d047ff
 F src/func.c 9856373f5315f6b8690d7f07f7191aa9f279ca87
 F src/global.c 448419c44ce0701104c2121b0e06919b44514c0c
@@ -736,7 +736,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P 90c3b23ccac8a9e7fc1cc831e43888e4e43badc9
-R 2ea8e871fa42548824353bc0cdc9bb93
-U danielk1977
-Z e38b100b5bb053d12d25eddf5e50616c
+P 62db08bc0de936e4a418ae583a3bdbbf33d7787e
+R ac56c8a806f7dbc960ad044fa18040b8
+U drh
+Z d0d0a90f42959f30bda016cc31abe318

diff --git a/manifest.uuid b/manifest.uuid
index c9e405202ed061039ef58269c15fcff25874c28e..48d39d33cc34b20a836e9e643b1274415d156311 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-62db08bc0de936e4a418ae583a3bdbbf33d7787e
\ No newline at end of file
+4bb96db6b4d2cfa71430a2646c1082a494e3519f
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 24fcb4aac4ae5c6cb7d51471cd9bd6d63491af9d..e331435fb92d2d472f7c24f4093b1c9b4d74f682 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -12,7 +12,7 @@
 ** This file contains routines used for analyzing expressions and
 ** for generating VDBE code that evaluates expressions in SQLite.
 **
-** $Id: expr.c,v 1.445 2009/06/01 16:53:10 shane Exp $
+** $Id: expr.c,v 1.446 2009/06/19 18:32:55 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -490,11 +490,11 @@ void sqlite3ExprAttachSubtrees(
 }
 
 /*
-** Allocate a Expr node which joins up to two subtrees.
+** Allocate a Expr node which joins as many as two subtrees.
 **
-** The 
-** Works like sqlite3Expr() except that it takes an extra Parse*
-** argument and notifies the associated connection object if malloc fails.
+** One or both of the subtrees can be NULL.  Return a pointer to the new
+** Expr node.  Or, if an OOM error occurs, set pParse->db->mallocFailed,
+** free the subtrees and return NULL.
 */
 Expr *sqlite3PExpr(
   Parse *pParse,          /* Parsing context */