diff options
| author | drh <drh@noemail.net> | 2014-07-24 16:54:28 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2014-07-24 16:54:28 +0000 |
| commit | 2bd2c29a955a2d459b2b300125eda1d79b070e64 (patch) | |
| tree | 3dac35daf7fb3c5a48c4e71900dfcff7b4a95311 /src/pragma.c | |
| parent | 6614181610e4c40e44484a1c7b14b253d512ad77 (diff) | |
| parent | ba5b09319e2f79707bcc55a84a5f059ea0949334 (diff) | |
| download | sqlite-2bd2c29a955a2d459b2b300125eda1d79b070e64.tar.gz sqlite-2bd2c29a955a2d459b2b300125eda1d79b070e64.zip | |
Merge all recent trunk changes into the threads branch.
FossilOrigin-Name: 770685892c8f09b9cddb2fbb2877cfb291e19425
Diffstat (limited to 'src/pragma.c')
| -rw-r--r-- | src/pragma.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pragma.c b/src/pragma.c index 4c69ceb4f..709662c98 100644 --- a/src/pragma.c +++ b/src/pragma.c @@ -1048,7 +1048,7 @@ void sqlite3Pragma( Pager *pPager = sqlite3BtreePager(pDb->pBt); i64 iLimit = -2; if( zRight ){ - sqlite3Atoi64(zRight, &iLimit, sqlite3Strlen30(zRight), SQLITE_UTF8); + sqlite3DecOrHexToI64(zRight, &iLimit); if( iLimit<-1 ) iLimit = -1; } iLimit = sqlite3PagerJournalSizeLimit(pPager, iLimit); @@ -1176,7 +1176,7 @@ void sqlite3Pragma( assert( sqlite3SchemaMutexHeld(db, iDb, 0) ); if( zRight ){ int ii; - sqlite3Atoi64(zRight, &sz, sqlite3Strlen30(zRight), SQLITE_UTF8); + sqlite3DecOrHexToI64(zRight, &sz); if( sz<0 ) sz = sqlite3GlobalConfig.szMmap; if( pId2->n==0 ) db->szMmap = sz; for(ii=db->nDb-1; ii>=0; ii--){ @@ -2219,7 +2219,7 @@ void sqlite3Pragma( */ case PragTyp_SOFT_HEAP_LIMIT: { sqlite3_int64 N; - if( zRight && sqlite3Atoi64(zRight, &N, 1000000, SQLITE_UTF8)==SQLITE_OK ){ + if( zRight && sqlite3DecOrHexToI64(zRight, &N)==SQLITE_OK ){ sqlite3_soft_heap_limit64(N); } returnSingleInt(pParse, "soft_heap_limit", sqlite3_soft_heap_limit64(-1)); |