1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-01 06:27:03 +03:00

Merge recent changes from trunk.

FossilOrigin-Name: 22e8e6901a119698de831ede6d8b03c4fd6576eaa8686a97a0b8aeea7593688a
This commit is contained in:
drh
2020-07-24 13:49:38 +00:00
11 changed files with 1875 additions and 18 deletions

View File

@ -698,7 +698,9 @@ static const char zHelp[] =
#include <stdio.h>
#include <string.h>
#include <assert.h>
#ifndef OMIT_ZLIB
#include "zlib.h"
#endif
/*
** Implementation of the "sqlar_uncompress(X,SZ)" SQL function
@ -715,6 +717,9 @@ static void sqlarUncompressFunc(
int argc,
sqlite3_value **argv
){
#ifdef OMIT_ZLIB
sqlite3_result_value(context, argv[0]);
#else
uLong nData;
uLongf sz;
@ -733,6 +738,7 @@ static void sqlarUncompressFunc(
}
sqlite3_free(pOut);
}
#endif
}