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/build.c | |
| 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/build.c')
| -rw-r--r-- | src/build.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/build.c b/src/build.c index af776cb3d..0921d6d25 100644 --- a/src/build.c +++ b/src/build.c @@ -2679,7 +2679,7 @@ static void sqlite3RefillIndex(Parse *pParse, Index *pIndex, int memRootPage){ /* Open the sorter cursor if we are to use one. */ iSorter = pParse->nTab++; - sqlite3VdbeAddOp4(v, OP_SorterOpen, iSorter, 0, 0, (char*) + sqlite3VdbeAddOp4(v, OP_SorterOpen, iSorter, 0, pIndex->nKeyCol, (char*) sqlite3KeyInfoRef(pKey), P4_KEYINFO); /* Open the table. Loop through all rows of the table, inserting index @@ -3028,7 +3028,7 @@ Index *sqlite3CreateIndex( pParse->checkSchema = 1; goto exit_create_index; } - assert( pTab->nCol<=0x7fff && j<=0x7fff ); + assert( j<=0x7fff ); pIndex->aiColumn[i] = (i16)j; if( pListItem->pExpr ){ int nColl; |