aboutsummaryrefslogtreecommitdiff
path: root/src/tokenize.c
diff options
context:
space:
mode:
authordan <dan@noemail.net>2015-03-24 18:21:41 +0000
committerdan <dan@noemail.net>2015-03-24 18:21:41 +0000
commit6da7a0a93da31b48081f50e92d4e7b5ffe19522d (patch)
tree3e9128ad52de6f69aa11508109f8eb28d1bb2309 /src/tokenize.c
parentf37120a416aee4703f5305e68c7535927678cc87 (diff)
parent126e9e6347216e47b538e4e8f24cfc2d752d89b3 (diff)
downloadsqlite-6da7a0a93da31b48081f50e92d4e7b5ffe19522d.tar.gz
sqlite-6da7a0a93da31b48081f50e92d4e7b5ffe19522d.zip
Merge the latest trunk changes into this branch.
FossilOrigin-Name: 9d9b6c883b4f7d69c615cedfb59a2385aac47b74
Diffstat (limited to 'src/tokenize.c')
-rw-r--r--src/tokenize.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/tokenize.c b/src/tokenize.c
index 6fb5a35c3..5068742f3 100644
--- a/src/tokenize.c
+++ b/src/tokenize.c
@@ -459,9 +459,11 @@ abort_parse:
sqlite3Parser(pEngine, 0, pParse->sLastToken, pParse);
}
#ifdef YYTRACKMAXSTACKDEPTH
+ sqlite3_mutex_enter(sqlite3MallocMutex());
sqlite3StatusSet(SQLITE_STATUS_PARSER_STACK,
sqlite3ParserStackPeak(pEngine)
);
+ sqlite3_mutex_leave(sqlite3MallocMutex());
#endif /* YYDEBUG */
sqlite3ParserFree(pEngine, sqlite3_free);
db->lookaside.bEnabled = enableLookaside;