aboutsummaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2014-07-24 16:23:51 +0000
committerdrh <drh@noemail.net>2014-07-24 16:23:51 +0000
commit35c3d8cc75623d1fe890c8aaaaabb174e5de8d23 (patch)
tree2e2cfdc5e4f43a0595f60d7b92f546a88d13366e /src/main.c
parentf257b4c61332fc7d64ad870e912338d0f31ef027 (diff)
parentba5b09319e2f79707bcc55a84a5f059ea0949334 (diff)
downloadsqlite-35c3d8cc75623d1fe890c8aaaaabb174e5de8d23.tar.gz
sqlite-35c3d8cc75623d1fe890c8aaaaabb174e5de8d23.zip
Merge recent trunk changes into the sessions branch.
FossilOrigin-Name: a9db017eabdefafcda87c497e8bafa07002ac0fe
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.c b/src/main.c
index 17bee29f1..7a72a9b0f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2122,8 +2122,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
@@ -3430,7 +3430,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;