diff options
| author | drh <drh@noemail.net> | 2014-09-02 15:49:47 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2014-09-02 15:49:47 +0000 |
| commit | bf9ed6f9af8db145efb7294b1bb05b35fc70e7fc (patch) | |
| tree | 870d850426bb945aee018a2dc2612f52f3248619 /src/vdbeInt.h | |
| parent | e1ed0b0e1787b0e5c6b2b59de4e2f161a82bec22 (diff) | |
| parent | f8ede57a6165889316f8a9df8ac1166c7a568100 (diff) | |
| download | sqlite-bf9ed6f9af8db145efb7294b1bb05b35fc70e7fc.tar.gz sqlite-bf9ed6f9af8db145efb7294b1bb05b35fc70e7fc.zip | |
Merge the latest trunk changes, including the multi-threaded sorter, into
the sessions branch.
FossilOrigin-Name: d4cce2c71e64ab7b6a65a81b88b69445ed859351
Diffstat (limited to 'src/vdbeInt.h')
| -rw-r--r-- | src/vdbeInt.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/vdbeInt.h b/src/vdbeInt.h index 54dd63f54..3cb8ddca4 100644 --- a/src/vdbeInt.h +++ b/src/vdbeInt.h @@ -266,8 +266,8 @@ struct AuxData { ** (Mem) which are only defined there. */ struct sqlite3_context { + Mem *pOut; /* The return value is stored here */ FuncDef *pFunc; /* Pointer to function information. MUST BE FIRST */ - Mem s; /* The return value is stored here */ Mem *pMem; /* Memory cell used to store aggregate context */ CollSeq *pColl; /* Collating sequence */ Vdbe *pVdbe; /* The VM that owns this context */ @@ -462,13 +462,13 @@ void sqlite3VdbePreUpdateHook( Vdbe *, VdbeCursor *, int, const char*, Table *, i64, int); int sqlite3VdbeTransferError(Vdbe *p); -int sqlite3VdbeSorterInit(sqlite3 *, VdbeCursor *); +int sqlite3VdbeSorterInit(sqlite3 *, int, VdbeCursor *); void sqlite3VdbeSorterReset(sqlite3 *, VdbeSorter *); void sqlite3VdbeSorterClose(sqlite3 *, VdbeCursor *); int sqlite3VdbeSorterRowkey(const VdbeCursor *, Mem *); int sqlite3VdbeSorterNext(sqlite3 *, const VdbeCursor *, int *); -int sqlite3VdbeSorterRewind(sqlite3 *, const VdbeCursor *, int *); -int sqlite3VdbeSorterWrite(sqlite3 *, const VdbeCursor *, Mem *); +int sqlite3VdbeSorterRewind(const VdbeCursor *, int *); +int sqlite3VdbeSorterWrite(const VdbeCursor *, Mem *); int sqlite3VdbeSorterCompare(const VdbeCursor *, Mem *, int, int *); #if !defined(SQLITE_OMIT_SHARED_CACHE) && SQLITE_THREADSAFE>0 |