Fix function name typo in mem1.c. This bug managed to make it into

the tree because the code in mem1.c is only compiled when the
-DSQLITE_MEMDEBUG compile-time option is omitted.  But
pre-checkin tests usually include this option.  Ticket #2612. (CVS 4368)

FossilOrigin-Name: 59e02db2402f9fcadfbeee88ab5778d27ddde634

diff --git a/manifest b/manifest
index 0d9fd207e3c00651db32304f34666e2ad5fab8fb..89a211b8cc0e16207f871e34f59cbd54cd807ba9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbug\sin\sjrnlTruncate().\sAnd\sother\scoverage\simprovements.\s(CVS\s4367)
-D 2007-09-01T18:24:55
+C Fix\sfunction\sname\stypo\sin\smem1.c.\s\sThis\sbug\smanaged\sto\smake\sit\sinto\nthe\stree\sbecause\sthe\scode\sin\smem1.c\sis\sonly\scompiled\swhen\sthe\n-DSQLITE_MEMDEBUG\scompile-time\soption\sis\somitted.\s\sBut\npre-checkin\stests\susually\sinclude\sthis\soption.\s\sTicket\s#2612.\s(CVS\s4368)
+D 2007-09-02T17:50:35
 F Makefile.in bfcc303429a5d9dcd552d807ee016c77427418c3
 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -102,7 +102,7 @@ F src/loadext.c 6894dbbf1666577d957922811620375d6c2f058d
 F src/main.c c271d9104b6bff13d2ddd9a72fcf0926e635a9fd
 F src/malloc.c de4e77fe70a9a0ac47a1c3a874422b107231bf31
 F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
-F src/mem1.c 9a939c061cc4a94b70b44c23eabf1415df64cc52
+F src/mem1.c 1f85902b98b38bd8a8b0c24012933957256db13e
 F src/mem2.c b97b4662bf5902cbde0a849c4739e64ce7b07177
 F src/mutex.c 40e5ba09d56863895882a0204d93832e9960ea78
 F src/mutex.h 079fa6fe9da18ceb89e79012c010594c6672addb
@@ -568,7 +568,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 280474595687bb843872f1bbc82cda3b1982085c
-R 79dcf90c69d6b342c82c65a3bd834a63
-U danielk1977
-Z 79ec946c5193429da927a09ff90c8dbe
+P 02b751fb9dbc683b1b77a2ed3cdeb4190f7339e0
+R 45c6bdf6644faf889f95225c86308b21
+U drh
+Z 76041633e96f0f564e922222926d7e4f

diff --git a/manifest.uuid b/manifest.uuid
index e891d1ea9bed2a726c7a362fcb82aa6e022f3a60..054600e7f928c26e38fb3e1ebb6fa8013c21d8cb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-02b751fb9dbc683b1b77a2ed3cdeb4190f7339e0
\ No newline at end of file
+59e02db2402f9fcadfbeee88ab5778d27ddde634
\ No newline at end of file

diff --git a/src/mem1.c b/src/mem1.c
index 16001a00916a8579c14329173050d128387d7823..1e9fcfa1450a9bb787a185b216f4eac10c689fc2 100644 (file)
--- a/src/mem1.c
+++ b/src/mem1.c
@@ -12,7 +12,7 @@
 ** This file contains the C functions that implement a memory
 ** allocation subsystem for use by SQLite.  
 **
-** $Id: mem1.c,v 1.9 2007/09/01 09:02:54 danielk1977 Exp $
+** $Id: mem1.c,v 1.10 2007/09/02 17:50:35 drh Exp $
 */
 
 /*
@@ -85,7 +85,7 @@ static void enterMem(void){
 */
 sqlite3_int64 sqlite3_memory_used(void){
   sqlite3_int64 n;
-  enterMutex();
+  enterMem();
   n = mem.nowUsed;
   sqlite3_mutex_leave(mem.mutex);  
   return n;
@@ -98,7 +98,7 @@ sqlite3_int64 sqlite3_memory_used(void){
 */
 sqlite3_int64 sqlite3_memory_highwater(int resetFlag){
   sqlite3_int64 n;
-  enterMutex();
+  enterMem();
   n = mem.mxUsed;
   if( resetFlag ){
     mem.mxUsed = mem.nowUsed;
@@ -115,7 +115,7 @@ int sqlite3_memory_alarm(
   void *pArg,
   sqlite3_int64 iThreshold
 ){
-  enterMutex();
+  enterMem();
   mem.alarmCallback = xCallback;
   mem.alarmArg = pArg;
   mem.alarmThreshold = iThreshold;
@@ -147,7 +147,7 @@ static void sqlite3MemsysAlarm(int nByte){
 void *sqlite3_malloc(int nBytes){
   sqlite3_int64 *p = 0;
   if( nBytes>0 ){
-    enterMutex();
+    enterMem();
     if( mem.alarmCallback!=0 && mem.nowUsed+nBytes>=mem.alarmThreshold ){
       sqlite3MemsysAlarm(nBytes);
     }