SQLite: Check-in [e54dded2]

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

Overview

Comment:	Fix harmless compiler warnings.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| threads
Files:	files \| file ages \| folders
SHA1:	e54dded2012f0ab486ee138e9bd57c528af33980
User & Date:	drh 2014-04-04 22:44:59

Context

2014-04-14
19:23		Allow the sorter to begin returning data to the VDBE as soon as it is available, instead of waiting until all keys have been sorted. (check-in: cb0ab20c user: dan tags: threads)
2014-04-09
20:04		Experimental multi-threaded sorting changes to allow the sorter to begin returning items to the VDBE before all data is sorted. (check-in: f9d5e09a user: dan tags: threads-experimental)
2014-04-07
18:44		Experimental multi-threaded sorting changes to begin merging PMAs before SorterRewind() is called. (Closed-Leaf check-in: cbfc0f6d user: dan tags: abandoned)
2014-04-04
22:44		Fix harmless compiler warnings. (check-in: e54dded2 user: drh tags: threads)
21:40		Fix typo in a Windows threading support routine. (check-in: 5e3dfa27 user: mistachkin tags: threads)

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/build.c.

  3014   3014       }
  3015   3015       if( j>=pTab->nCol ){
  3016   3016         sqlite3ErrorMsg(pParse, "table %s has no column named %s",
  3017   3017           pTab->zName, zColName);
  3018   3018         pParse->checkSchema = 1;
  3019   3019         goto exit_create_index;
  3020   3020       }
  3021         -    assert( pTab->nCol<=0x7fff && j<=0x7fff );
         3021  +    assert( j<=0x7fff );
  3022   3022       pIndex->aiColumn[i] = (i16)j;
  3023   3023       if( pListItem->pExpr ){
  3024   3024         int nColl;
  3025   3025         assert( pListItem->pExpr->op==TK_COLLATE );
  3026   3026         zColl = pListItem->pExpr->u.zToken;
  3027   3027         nColl = sqlite3Strlen30(zColl) + 1;
  3028   3028         assert( nExtra>=nColl );

Changes to src/sqliteInt.h.

  3648   3648   #define MEMTYPE_SCRATCH    0x04  /* Scratch allocations */
  3649   3649   #define MEMTYPE_PCACHE     0x08  /* Page cache allocations */
  3650   3650   #define MEMTYPE_DB         0x10  /* Uses sqlite3DbMalloc, not sqlite_malloc */
  3651   3651   
  3652   3652   /*
  3653   3653   ** Threading interface
  3654   3654   */
         3655  +#if SQLITE_MAX_WORKER_THREADS>0
  3655   3656   int sqlite3ThreadCreate(SQLiteThread**,void*(*)(void*),void*);
  3656   3657   int sqlite3ThreadJoin(SQLiteThread*, void**);
         3658  +#endif
  3657   3659   
  3658   3660   /*
  3659   3661   ** Win32 interface
  3660   3662   */
  3661   3663   #if SQLITE_OS_WIN
  3662   3664     DWORD sqlite3Win32Wait(HANDLE hObject);
  3663   3665   #endif
  3664   3666   
  3665   3667   #endif /* _SQLITEINT_H_ */