From: dan <dan@noemail.net>
Date: Tue, 5 Dec 2017 18:32:40 +0000 (+0000)
Subject: If SQLITE_HAVE_ZLIB is defined at build-time, include the functions in
X-Git-Tag: version-3.22.0~108^2~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=72afc3c5de1a4c125b919fe086f83dfe27a43e03;p=thirdparty%2Fsqlite.git

If SQLITE_HAVE_ZLIB is defined at build-time, include the functions in
ext/misc/compress.c in the shell.

FossilOrigin-Name: 0296286a9963bbaab60ee30d8700703f5ccb382380c9bfc0eb12c4bcb6f2accd
---

diff --git a/manifest b/manifest
index f5ffa7a07d..d6e9390bd0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\scompilation\sproblem\swhen\sboth\sSQLITE_ENABLE_MULTITHREADED_CHECKS\sand\nSQLITE_ENABLE_API_ARMOUR\sare\sdefined.
-D 2017-12-05T14:58:59.468
+C If\sSQLITE_HAVE_ZLIB\sis\sdefined\sat\sbuild-time,\sinclude\sthe\sfunctions\sin\next/misc/compress.c\sin\sthe\sshell.
+D 2017-12-05T18:32:40.201
 F Makefile.in 6a879cbf01e37f9eac131414955f71774b566502d9a57ded1b8585b507503cb8
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e5d7606238f55816da99f719969598df5b091aa2e9a6935c9412fcae8f53fc44
@@ -472,7 +472,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c bbee7e31d369a18a2f4836644769882e9c5d40ef4a3af911db06410b65cb3730
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c 17e220191860a64a18c084141e1a8b7309e166a6f2d42c02021af27ea080d157
-F src/shell.c.in 6ffed0c589f5aff180789a8c8abf5b2d3e2eea7470c86b30e797887cb0c9d0e5
+F src/shell.c.in ab727c09b4c87c0c1db32d2fe0a910c0a8e468a0209233328753f5526d6c6c73
 F src/sqlite.h.in 8fd97993d48b50b9bade38c52f12d175942c9497c960905610c7b03a3e4b5818
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h c02d628cca67f3889c689d82d25c3eb45e2c155db08e4c6089b5840d64687d34
@@ -1679,7 +1679,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 5771b1d611b3562ea6c040f3f893073c4d0ee58c35b37ae211520d9aee8ed547
-R 926398ae5d668c18adb3c9f09b2dd707
+P 0342ce510d2063a63839399a2cfa25b7fc02f4fde17764082676b332d6136241
+R eddb6c6e05812e7a9afe7b2909e80007
+T *branch * sqlar-shell-support
+T *sym-sqlar-shell-support *
+T -sym-trunk *
 U dan
-Z 60a10472a4a400f76cfacb5adca001dc
+Z e3b1a40cd391e9a775fce7f501c26e90
diff --git a/manifest.uuid b/manifest.uuid
index 3ccf62c280..6f484dbf3c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0342ce510d2063a63839399a2cfa25b7fc02f4fde17764082676b332d6136241
\ No newline at end of file
+0296286a9963bbaab60ee30d8700703f5ccb382380c9bfc0eb12c4bcb6f2accd
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index 062f76e475..edd75b078c 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -796,6 +796,9 @@ static void shellAddSchemaName(
 INCLUDE ../ext/misc/shathree.c
 INCLUDE ../ext/misc/fileio.c
 INCLUDE ../ext/misc/completion.c
+#ifdef SQLITE_HAVE_ZLIB
+INCLUDE ../ext/misc/compress.c
+#endif
 
 #if defined(SQLITE_ENABLE_SESSION)
 /*
@@ -2897,6 +2900,9 @@ static void open_db(ShellState *p, int keepAlive){
     sqlite3_fileio_init(p->db, 0, 0);
     sqlite3_shathree_init(p->db, 0, 0);
     sqlite3_completion_init(p->db, 0, 0);
+#ifdef SQLITE_HAVE_ZLIB
+    sqlite3_compress_init(p->db, 0, 0);
+#endif
     sqlite3_create_function(p->db, "shell_add_schema", 2, SQLITE_UTF8, 0,
                             shellAddSchemaName, 0, 0);
   }