|
@@ -676,7 +676,7 @@ extern "C" {
|
|
|
*/
|
|
*/
|
|
|
#define SQLITE_VERSION "3.7.16"
|
|
#define SQLITE_VERSION "3.7.16"
|
|
|
#define SQLITE_VERSION_NUMBER 3007016
|
|
#define SQLITE_VERSION_NUMBER 3007016
|
|
|
-#define SQLITE_SOURCE_ID "2013-02-26 12:57:42 c2d5a23b1ab39918e97c596cf75c42f86a5fe2b7"
|
|
|
|
|
|
|
+#define SQLITE_SOURCE_ID "2013-03-01 21:01:05 f476eace86102fd5442cfbba169c18f6ee44eae2"
|
|
|
|
|
|
|
|
/*
|
|
/*
|
|
|
** CAPI3REF: Run-Time Library Version Numbers
|
|
** CAPI3REF: Run-Time Library Version Numbers
|
|
@@ -27844,7 +27844,7 @@ static int fillInUnixFile(
|
|
|
"psow", SQLITE_POWERSAFE_OVERWRITE) ){
|
|
"psow", SQLITE_POWERSAFE_OVERWRITE) ){
|
|
|
pNew->ctrlFlags |= UNIXFILE_PSOW;
|
|
pNew->ctrlFlags |= UNIXFILE_PSOW;
|
|
|
}
|
|
}
|
|
|
- if( memcmp(pVfs->zName,"unix-excl",10)==0 ){
|
|
|
|
|
|
|
+ if( strcmp(pVfs->zName,"unix-excl")==0 ){
|
|
|
pNew->ctrlFlags |= UNIXFILE_EXCL;
|
|
pNew->ctrlFlags |= UNIXFILE_EXCL;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -43999,7 +43999,8 @@ SQLITE_PRIVATE int sqlite3PagerMovepage(Pager *pPager, DbPage *pPg, Pgno pgno, i
|
|
|
*/
|
|
*/
|
|
|
if( (pPg->flags&PGHDR_NEED_SYNC) && !isCommit ){
|
|
if( (pPg->flags&PGHDR_NEED_SYNC) && !isCommit ){
|
|
|
needSyncPgno = pPg->pgno;
|
|
needSyncPgno = pPg->pgno;
|
|
|
- assert( pageInJournal(pPg) || pPg->pgno>pPager->dbOrigSize );
|
|
|
|
|
|
|
+ assert( pPager->journalMode==PAGER_JOURNALMODE_OFF ||
|
|
|
|
|
+ pageInJournal(pPg) || pPg->pgno>pPager->dbOrigSize );
|
|
|
assert( pPg->flags&PGHDR_DIRTY );
|
|
assert( pPg->flags&PGHDR_DIRTY );
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -63296,7 +63297,7 @@ SQLITE_PRIVATE int sqlite3VdbeParameterIndex(Vdbe *p, const char *zName, int nNa
|
|
|
if( zName ){
|
|
if( zName ){
|
|
|
for(i=0; i<p->nzVar; i++){
|
|
for(i=0; i<p->nzVar; i++){
|
|
|
const char *z = p->azVar[i];
|
|
const char *z = p->azVar[i];
|
|
|
- if( z && memcmp(z,zName,nName)==0 && z[nName]==0 ){
|
|
|
|
|
|
|
+ if( z && strncmp(z,zName,nName)==0 && z[nName]==0 ){
|
|
|
return i+1;
|
|
return i+1;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -74748,7 +74749,7 @@ SQLITE_PRIVATE void sqlite3ExprAssignVarNumber(Parse *pParse, Expr *pExpr){
|
|
|
*/
|
|
*/
|
|
|
ynVar i;
|
|
ynVar i;
|
|
|
for(i=0; i<pParse->nzVar; i++){
|
|
for(i=0; i<pParse->nzVar; i++){
|
|
|
- if( pParse->azVar[i] && memcmp(pParse->azVar[i],z,n+1)==0 ){
|
|
|
|
|
|
|
+ if( pParse->azVar[i] && strcmp(pParse->azVar[i],z)==0 ){
|
|
|
pExpr->iColumn = x = (ynVar)i+1;
|
|
pExpr->iColumn = x = (ynVar)i+1;
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
@@ -79605,7 +79606,7 @@ static void analyzeOneTable(
|
|
|
/* Do not gather statistics on views or virtual tables */
|
|
/* Do not gather statistics on views or virtual tables */
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
- if( memcmp(pTab->zName, "sqlite_", 7)==0 ){
|
|
|
|
|
|
|
+ if( sqlite3_strnicmp(pTab->zName, "sqlite_", 7)==0 ){
|
|
|
/* Do not gather statistics on system tables */
|
|
/* Do not gather statistics on system tables */
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
@@ -80015,7 +80016,7 @@ static int analysisLoader(void *pData, int argc, char **argv, char **NotUsed){
|
|
|
if( pIndex==0 ) break;
|
|
if( pIndex==0 ) break;
|
|
|
pIndex->aiRowEst[i] = v;
|
|
pIndex->aiRowEst[i] = v;
|
|
|
if( *z==' ' ) z++;
|
|
if( *z==' ' ) z++;
|
|
|
- if( memcmp(z, "unordered", 10)==0 ){
|
|
|
|
|
|
|
+ if( strcmp(z, "unordered")==0 ){
|
|
|
pIndex->bUnordered = 1;
|
|
pIndex->bUnordered = 1;
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
@@ -83664,7 +83665,7 @@ SQLITE_PRIVATE Index *sqlite3CreateIndex(
|
|
|
assert( pTab!=0 );
|
|
assert( pTab!=0 );
|
|
|
assert( pParse->nErr==0 );
|
|
assert( pParse->nErr==0 );
|
|
|
if( sqlite3StrNICmp(pTab->zName, "sqlite_", 7)==0
|
|
if( sqlite3StrNICmp(pTab->zName, "sqlite_", 7)==0
|
|
|
- && memcmp(&pTab->zName[7],"altertab_",9)!=0 ){
|
|
|
|
|
|
|
+ && sqlite3StrNICmp(&pTab->zName[7],"altertab_",9)!=0 ){
|
|
|
sqlite3ErrorMsg(pParse, "table %s may not be indexed", pTab->zName);
|
|
sqlite3ErrorMsg(pParse, "table %s may not be indexed", pTab->zName);
|
|
|
goto exit_create_index;
|
|
goto exit_create_index;
|
|
|
}
|
|
}
|
|
@@ -87125,10 +87126,10 @@ static void charFunc(
|
|
|
if( x<0 || x>0x10ffff ) x = 0xfffd;
|
|
if( x<0 || x>0x10ffff ) x = 0xfffd;
|
|
|
c = (unsigned)(x & 0x1fffff);
|
|
c = (unsigned)(x & 0x1fffff);
|
|
|
if( c<=0xFFFF ){
|
|
if( c<=0xFFFF ){
|
|
|
|
|
+ if( c>=0xd800 && c<=0xdfff ) c = 0xfffd;
|
|
|
*zOut++ = (u8)(c&0x00FF);
|
|
*zOut++ = (u8)(c&0x00FF);
|
|
|
*zOut++ = (u8)((c>>8)&0x00FF);
|
|
*zOut++ = (u8)((c>>8)&0x00FF);
|
|
|
}else{
|
|
}else{
|
|
|
- if( c>=0xd800 && c<=0xdbff ) c = 0xfffd;
|
|
|
|
|
*zOut++ = (u8)(((c>>10)&0x003F) + (((c-0x10000)>>10)&0x00C0));
|
|
*zOut++ = (u8)(((c>>10)&0x003F) + (((c-0x10000)>>10)&0x00C0));
|
|
|
*zOut++ = (u8)(0x00D8 + (((c-0x10000)>>18)&0x03));
|
|
*zOut++ = (u8)(0x00D8 + (((c-0x10000)>>18)&0x03));
|
|
|
*zOut++ = (u8)(c&0x00FF);
|
|
*zOut++ = (u8)(c&0x00FF);
|