aboutsummaryrefslogtreecommitdiff
path: root/src/shell.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2015-10-09 15:29:24 +0000
committerdrh <drh@noemail.net>2015-10-09 15:29:24 +0000
commit973bc6f1a8d57992248eef0355671bf036d87042 (patch)
treea1935cd8fb2ebf10960b4ecaae93901e33f68455 /src/shell.c
parent2d000eafbe22869fd9c25a01d2f7de7232ea67e5 (diff)
parent2572751be87022f7dcfdfbae8d874e68a1382b66 (diff)
downloadsqlite-973bc6f1a8d57992248eef0355671bf036d87042.tar.gz
sqlite-973bc6f1a8d57992248eef0355671bf036d87042.zip
Merge the version 3.9.0 changes and the incorporation of JSON1 and FTS5
into the amalgamation from trunk. FossilOrigin-Name: c1d96fb654b2c0f66d586aa39d80ea0468186690
Diffstat (limited to 'src/shell.c')
-rw-r--r--src/shell.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/shell.c b/src/shell.c
index ca8e37186..ec76eeea9 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -4935,13 +4935,6 @@ int SQLITE_CDECL main(int argc, char **argv){
}
data.out = stdout;
-#ifdef SQLITE_SHELL_JSON1
- {
- extern int sqlite3_json_init(sqlite3*);
- sqlite3_auto_extension((void(*)(void))sqlite3_json_init);
- }
-#endif
-
/* Go ahead and open the database file if it already exists. If the
** file does not exist, delay opening it. This prevents empty database
** files from being created if a user mistypes the database name argument