From: drh <drh@noemail.net>
Date: Mon, 12 Jan 2004 00:38:18 +0000 (+0000)
Subject: Previous commit of changes to the in-memory backend was not quite right.
X-Git-Tag: version-3.6.10~4898
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=7b40e608008b4ff5e8442df53e7a9ba5ac4fc29a;p=thirdparty%2Fsqlite.git

Previous commit of changes to the in-memory backend was not quite right.
This check-in should square things away. (CVS 1170)

FossilOrigin-Name: 75d91e3bca44787768b1970203878dd4b1e31e55
---

diff --git a/manifest b/manifest
index 9f9cc8a303..666e67118d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\sthe\sin-memory\sdatabase\scan\shandle\smalloc\sfailures.\s(CVS\s1169)
-D 2004-01-12T00:21:52
+C Previous\scommit\sof\schanges\sto\sthe\sin-memory\sbackend\swas\snot\squite\sright.\nThis\scheck-in\sshould\ssquare\sthings\saway.\s(CVS\s1170)
+D 2004-01-12T00:38:18
 F Makefile.in 0515ff9218ad8d5a8f6220f0494b8ef94c67013b
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -25,7 +25,7 @@ F src/attach.c 9a3764bbccb1c8b39321630006fbaa0fb8bd1822
 F src/auth.c c59ad0dab501888f8b1fccc25e2f5965d2265116
 F src/btree.c 9ab30f0504ef69ba4cba2f264d8096c5abc2b7b8
 F src/btree.h 9b7c09f1e64274d7bb74a57bbfc63778f67b1048
-F src/btree_rb.c 8099bcf8645ea0acd698c6a6ca46f2f0a0bca5bb
+F src/btree_rb.c 50210dfd2a5f410c8624ef8fde8e82babd376d9f
 F src/build.c a7493c433de5b552f9535d8fa7ed80aaf135491e
 F src/copy.c 9e47975ea96751c658bcf1a0c4f0bb7c6ee61e73
 F src/date.c bb89fdb9c89e367b9a728c58cb96e4823974a2c1
@@ -179,7 +179,7 @@ F www/speed.tcl 2f6b1155b99d39adb185f900456d1d592c4832b3
 F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
-P 34a6b7416c6c9bcdf301f5e7b072a0362a746105
-R ac3afb88f5f267ab631548289577e731
+P ba92af182c6c9c6b2e3816006191eedd424cdf1a
+R 307cb45777333f2e72fe44cddf3ecacb
 U drh
-Z 3b4e454fa5b8ade83f8e931bb2e45a2d
+Z f695ac6fe51efc19af97215d9291a74f
diff --git a/manifest.uuid b/manifest.uuid
index a9cf15a1b1..ff13cf5c9b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ba92af182c6c9c6b2e3816006191eedd424cdf1a
\ No newline at end of file
+75d91e3bca44787768b1970203878dd4b1e31e55
\ No newline at end of file
diff --git a/src/btree_rb.c b/src/btree_rb.c
index 7f7fa98f33..837e0e471b 100644
--- a/src/btree_rb.c
+++ b/src/btree_rb.c
@@ -9,7 +9,7 @@
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** $Id: btree_rb.c,v 1.19 2004/01/12 00:21:52 drh Exp $
+** $Id: btree_rb.c,v 1.20 2004/01/12 00:38:18 drh Exp $
 **
 ** This file implements an in-core database using Red-Black balanced
 ** binary trees.
@@ -765,7 +765,7 @@ static int memRbtreeInsert(
   /* Take a copy of the input data now, in case we need it for the 
    * replace case */
   pData = sqliteMallocRaw(nData);
-  if( pData==0 ) return SQLITE_NOMEM;
+  if( sqlite_malloc_failed ) return SQLITE_NOMEM;
   memcpy(pData, pDataInput, nData);
 
   /* Move the cursor to a node near the key to be inserted. If the key already
@@ -785,7 +785,7 @@ static int memRbtreeInsert(
     if( pNode==0 ) return SQLITE_NOMEM;
     pNode->nKey = nKey;
     pNode->pKey = sqliteMallocRaw(nKey);
-    if( pNode->pKey==0 ) return SQLITE_NOMEM;
+    if( sqlite_malloc_failed ) return SQLITE_NOMEM;
     memcpy(pNode->pKey, pKey, nKey);
     pNode->nData = nData;
     pNode->pData = pData; 
@@ -822,7 +822,7 @@ static int memRbtreeInsert(
       pOp->iTab = pCur->iTree;
       pOp->nKey = pNode->nKey;
       pOp->pKey = sqliteMallocRaw( pOp->nKey );
-      if( pOp->pKey==0 ) return SQLITE_NOMEM;
+      if( sqlite_malloc_failed ) return SQLITE_NOMEM;
       memcpy( pOp->pKey, pNode->pKey, pOp->nKey );
       btreeLogRollbackOp(pCur->pRbtree, pOp);
     }
@@ -838,7 +838,7 @@ static int memRbtreeInsert(
       pOp->iTab = pCur->iTree;
       pOp->nKey = pCur->pNode->nKey;
       pOp->pKey = sqliteMallocRaw( pOp->nKey );
-      if( pOp->pKey==0 ) return SQLITE_NOMEM;
+      if( sqlite_malloc_failed ) return SQLITE_NOMEM;
       memcpy( pOp->pKey, pCur->pNode->pKey, pOp->nKey );
       pOp->nData = pCur->pNode->nData;
       pOp->pData = pCur->pNode->pData;