diff options
| author | drh <drh@noemail.net> | 2015-09-30 14:50:39 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2015-09-30 14:50:39 +0000 |
| commit | 32af5eda6a6bd8afaad724fa61166ee92f935af5 (patch) | |
| tree | ddf5f23f29daccf300fa9d0188a7a766dfcd560e /src/main.c | |
| parent | 9ec0efd946b8015f8b3ba3b726bc39f0b15d306c (diff) | |
| parent | 105865acf9644a66cc73a84dde72937b83dd5315 (diff) | |
| download | sqlite-32af5eda6a6bd8afaad724fa61166ee92f935af5.tar.gz sqlite-32af5eda6a6bd8afaad724fa61166ee92f935af5.zip | |
Merge recent enhancements from trunk, and especially the fix for
ticket [1b266395d6bc10].
FossilOrigin-Name: b2face9aa95ade96a5666c70b6b31064c1ad0977
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/main.c b/src/main.c index fbb7da437..2aca573b0 100644 --- a/src/main.c +++ b/src/main.c @@ -2917,6 +2917,13 @@ static int openDatabase( } #endif +#ifdef SQLITE_ENABLE_JSON1 + if( !db->mallocFailed && rc==SQLITE_OK){ + extern int sqlite3Json1Init(sqlite3*); + rc = sqlite3Json1Init(db); + } +#endif + /* -DSQLITE_DEFAULT_LOCKING_MODE=1 makes EXCLUSIVE the default locking ** mode. -DSQLITE_DEFAULT_LOCKING_MODE=0 make NORMAL the default locking ** mode. Doing nothing at all also makes NORMAL the default. |