diff options
| author | Hans-Christoph Steiner <hans@eds.org> | 2014-10-16 22:51:43 -0400 |
|---|---|---|
| committer | Hans-Christoph Steiner <hans@eds.org> | 2014-10-16 22:51:43 -0400 |
| commit | 9f67c0520ea0d5f11a190197cdf746c512db4ce4 (patch) | |
| tree | c88a33f01f20a3d13a09594f114fffacebd0d1a4 /src/test8.c | |
| parent | ee20336e9c78d2e3782c8d096b9ab4f6ca8ce95f (diff) | |
| parent | 569c6676a6ddb0ff73821d7693b5e18ddef809b9 (diff) | |
Merge tag 'upstream/3.2.0'
Upstream version 3.2.0
# gpg: Signature made Thu 16 Oct 2014 10:51:39 PM EDT using RSA key ID 374BBE81
# gpg: Good signature from "Hans-Christoph Steiner <hans@guardianproject.info>"
# gpg: aka "Hans-Christoph Steiner <hans@eds.org>"
# gpg: aka "Hans-Christoph Steiner <hans@at.or.at>"
# gpg: aka "[jpeg image of size 5408]"
Diffstat (limited to 'src/test8.c')
| -rw-r--r-- | src/test8.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/test8.c b/src/test8.c index c573933..8bc835d 100644 --- a/src/test8.c +++ b/src/test8.c @@ -265,6 +265,7 @@ static int getIndexArray( while( pStmt && sqlite3_step(pStmt)==SQLITE_ROW ){ const char *zIdx = (const char *)sqlite3_column_text(pStmt, 1); sqlite3_stmt *pStmt2 = 0; + if( zIdx==0 ) continue; zSql = sqlite3_mprintf("PRAGMA index_info(%s)", zIdx); if( !zSql ){ rc = SQLITE_NOMEM; @@ -891,7 +892,7 @@ static int echoBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){ pIdxInfo->estimatedCost = cost; }else if( useIdx ){ /* Approximation of log2(nRow). */ - for( ii=0; ii<(sizeof(int)*8); ii++ ){ + for( ii=0; ii<(sizeof(int)*8)-1; ii++ ){ if( nRow & (1<<ii) ){ pIdxInfo->estimatedCost = (double)ii; } |