diff options
author | drh <drh@noemail.net> | 2015-04-15 14:14:38 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2015-04-15 14:14:38 +0000 |
commit | ff363ee1217d79e8988a16ef0d72e5ee1729dc48 (patch) | |
tree | ad4bf050eb315f2742224500d564bb8918458bf5 /src/insert.c | |
parent | df3c171881b4ee77003b9d7e287220c22dbc97a2 (diff) | |
parent | 0d01ec8de83b4e0d7523d67c5f92a44f0ba79b8e (diff) | |
download | sqlite-ff363ee1217d79e8988a16ef0d72e5ee1729dc48.tar.gz sqlite-ff363ee1217d79e8988a16ef0d72e5ee1729dc48.zip |
Merge all recent trunk fixes and enhancements into the sessions branch.
FossilOrigin-Name: e65e65f9bc9b4bf5c9dd6e3a77a0d5f03c40e006
Diffstat (limited to 'src/insert.c')
-rw-r--r-- | src/insert.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/insert.c b/src/insert.c index d14919c1f..805e85008 100644 --- a/src/insert.c +++ b/src/insert.c @@ -2036,7 +2036,8 @@ static int xferOptimization( int i; for(i=0; i<pSrcIdx->nColumn; i++){ char *zColl = pSrcIdx->azColl[i]; - if( zColl && sqlite3_stricmp("BINARY", zColl) ) break; + assert( zColl!=0 ); + if( sqlite3_stricmp("BINARY", zColl) ) break; } if( i==pSrcIdx->nColumn ){ useSeekResult = OPFLAG_USESEEKRESULT; |