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/main.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/main.c')
| -rw-r--r-- | src/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.c b/src/main.c index aabe187d9..639491778 100644 --- a/src/main.c +++ b/src/main.c @@ -2110,8 +2110,8 @@ static const int aHardLimit[] = { #if SQLITE_MAX_FUNCTION_ARG<0 || SQLITE_MAX_FUNCTION_ARG>1000 # error SQLITE_MAX_FUNCTION_ARG must be between 0 and 1000 #endif -#if SQLITE_MAX_ATTACHED<0 || SQLITE_MAX_ATTACHED>62 -# error SQLITE_MAX_ATTACHED must be between 0 and 62 +#if SQLITE_MAX_ATTACHED<0 || SQLITE_MAX_ATTACHED>125 +# error SQLITE_MAX_ATTACHED must be between 0 and 125 #endif #if SQLITE_MAX_LIKE_PATTERN_LENGTH<1 # error SQLITE_MAX_LIKE_PATTERN_LENGTH must be at least 1 @@ -3426,7 +3426,7 @@ sqlite3_int64 sqlite3_uri_int64( ){ const char *z = sqlite3_uri_parameter(zFilename, zParam); sqlite3_int64 v; - if( z && sqlite3Atoi64(z, &v, sqlite3Strlen30(z), SQLITE_UTF8)==SQLITE_OK ){ + if( z && sqlite3DecOrHexToI64(z, &v)==SQLITE_OK ){ bDflt = v; } return bDflt; |