SQLite: Check-in [e0de5807]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

Comment:	Fix a harmless compiler warning.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA1:	e0de580726a0ed35565783ed14440ef9bcdc3a3d
User & Date:	drh 2015-01-02 21:54:32

Context

2015-01-03
18:59		In releasetest.tcl, omit the CC=clang text from the label on Sanitize tests, so that the label fits on an 80-character line. (check-in: 23d4c07e user: drh tags: trunk)
2015-01-02
21:54		Fix a harmless compiler warning. (check-in: e0de5807 user: drh tags: trunk)
15:55		Add the SQLITE_CONFIG_PMASZ start-time option. (check-in: acb0d1e8 user: drh tags: trunk)

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/vdbesort.c.

   845    845         pTask->pSorter = pSorter;
   846    846       }
   847    847   
   848    848       if( !sqlite3TempInMemory(db) ){
   849    849         u32 szPma = sqlite3GlobalConfig.szPma;
   850    850         pSorter->mnPmaSize = szPma * pgsz;
   851    851         mxCache = db->aDb[0].pSchema->cache_size;
   852         -      if( mxCache<szPma ) mxCache = szPma;
          852  +      if( mxCache<(int)szPma ) mxCache = (int)szPma;
   853    853         pSorter->mxPmaSize = MIN((i64)mxCache*pgsz, SQLITE_MAX_PMASZ);
   854    854   
   855    855         /* EVIDENCE-OF: R-26747-61719 When the application provides any amount of
   856    856         ** scratch memory using SQLITE_CONFIG_SCRATCH, SQLite avoids unnecessary
   857    857         ** large heap allocations.
   858    858         */
   859    859         if( sqlite3GlobalConfig.pScratch==0 ){