Skip to content

Commit b8e6e27

Browse files
sjlombardosjlombardo
committed
Merge branch 'sqlite-release' into prerelease-integration
2 parents 1309dcf + 04c4033 commit b8e6e27

53 files changed

Lines changed: 542 additions & 852 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.31.0
1+
3.32.0

‎autoconf/tea/configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dnl to configure the system for the local environment.
1919
# so you can encode the package version directly into the source files.
2020
#-----------------------------------------------------------------------
2121

22-
AC_INIT([sqlite], [3.31.0])
22+
AC_INIT([sqlite], [3.32.0])
2323

2424
#--------------------------------------------------------------------
2525
# Call TEA_INIT as the first TEA_ macro to set up initial vars.

‎configure‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.69 for sqlcipher 3.31.0.
3+
# Generated by GNU Autoconf 2.69 for sqlcipher 3.32.0.
44
#
55
#
66
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
587587
# Identity of this package.
588588
PACKAGE_NAME='sqlcipher'
589589
PACKAGE_TARNAME='sqlcipher'
590-
PACKAGE_VERSION='3.31.0'
591-
PACKAGE_STRING='sqlcipher 3.31.0'
590+
PACKAGE_VERSION='3.32.0'
591+
PACKAGE_STRING='sqlcipher 3.32.0'
592592
PACKAGE_BUGREPORT=''
593593
PACKAGE_URL=''
594594

@@ -1338,7 +1338,7 @@ if test "$ac_init_help" = "long"; then
13381338
# Omit some internal or obsolete options to make the list less imposing.
13391339
# This message is too long to be a string in the A/UX 3.1 sh.
13401340
cat <<_ACEOF
1341-
\`configure' configures sqlcipher 3.31.0 to adapt to many kinds of systems.
1341+
\`configure' configures sqlcipher 3.32.0 to adapt to many kinds of systems.
13421342
13431343
Usage: $0 [OPTION]... [VAR=VALUE]...
13441344
@@ -1403,7 +1403,7 @@ fi
14031403

14041404
if test -n "$ac_init_help"; then
14051405
case $ac_init_help in
1406-
short | recursive ) echo "Configuration of sqlcipher 3.31.0:";;
1406+
short | recursive ) echo "Configuration of sqlcipher 3.32.0:";;
14071407
esac
14081408
cat <<\_ACEOF
14091409
@@ -1540,7 +1540,7 @@ fi
15401540
test -n "$ac_init_help" && exit $ac_status
15411541
if $ac_init_version; then
15421542
cat <<\_ACEOF
1543-
sqlcipher configure 3.31.0
1543+
sqlcipher configure 3.32.0
15441544
generated by GNU Autoconf 2.69
15451545
15461546
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1959,7 +1959,7 @@ cat >config.log <<_ACEOF
19591959
This file contains any messages produced by compilers while
19601960
running configure, to aid debugging if configure makes a mistake.
19611961
1962-
It was created by sqlcipher $as_me 3.31.0, which was
1962+
It was created by sqlcipher $as_me 3.32.0, which was
19631963
generated by GNU Autoconf 2.69. Invocation command line was
19641964
19651965
$ $0 $@
@@ -13819,7 +13819,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1381913819
# report actual input values of CONFIG_FILES etc. instead of their
1382013820
# values after options handling.
1382113821
ac_log="
13822-
This file was extended by sqlcipher $as_me 3.31.0, which was
13822+
This file was extended by sqlcipher $as_me 3.32.0, which was
1382313823
generated by GNU Autoconf 2.69. Invocation command line was
1382413824
1382513825
CONFIG_FILES = $CONFIG_FILES
@@ -13885,7 +13885,7 @@ _ACEOF
1388513885
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1388613886
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1388713887
ac_cs_version="\\
13888-
sqlcipher config.status 3.31.0
13888+
sqlcipher config.status 3.32.0
1388913889
configured by $0, generated by GNU Autoconf 2.69,
1389013890
with options \\"\$ac_cs_config\\"
1389113891

‎ext/fts3/fts3_tokenize_vtab.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ static int fts3tokFilterMethod(
350350
if( pCsr->zInput==0 ){
351351
rc = SQLITE_NOMEM;
352352
}else{
353-
memcpy(pCsr->zInput, zByte, nByte);
353+
if( nByte>0 ) memcpy(pCsr->zInput, zByte, nByte);
354354
pCsr->zInput[nByte] = 0;
355355
rc = pTab->pMod->xOpen(pTab->pTok, pCsr->zInput, nByte, &pCsr->pCsr);
356356
if( rc==SQLITE_OK ){

‎ext/fts3/fts3_write.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2502,7 +2502,7 @@ static int fts3SegmentIsMaxLevel(Fts3Table *p, i64 iAbsLevel, int *pbMax){
25022502
if( rc!=SQLITE_OK ) return rc;
25032503
sqlite3_bind_int64(pStmt, 1, iAbsLevel+1);
25042504
sqlite3_bind_int64(pStmt, 2,
2505-
((iAbsLevel/FTS3_SEGDIR_MAXLEVEL)+1) * FTS3_SEGDIR_MAXLEVEL
2505+
(((u64)iAbsLevel/FTS3_SEGDIR_MAXLEVEL)+1) * FTS3_SEGDIR_MAXLEVEL
25062506
);
25072507

25082508
*pbMax = 0;

‎ext/fts5/fts5_index.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5732,8 +5732,8 @@ static int fts5QueryCksum(
57325732
** contain valid utf-8, return non-zero.
57335733
*/
57345734
static int fts5TestUtf8(const char *z, int n){
5735-
assert_nc( n>0 );
57365735
int i = 0;
5736+
assert_nc( n>0 );
57375737
while( i<n ){
57385738
if( (z[i] & 0x80)==0x00 ){
57395739
i++;

‎ext/fts5/test/fts5matchinfo.test‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -500,14 +500,18 @@ do_execsql_test 15.0 {
500500
INSERT INTO t1 VALUES('c', 'd');
501501
}
502502

503+
if {$tcl_platform(byteOrder)=="littleEndian"} {
504+
set res {X'02000000'}
505+
} else {
506+
set res {X'00000002'}
507+
}
503508
do_execsql_test 15.1 {
504509
SELECT quote(matchinfo(t1, 'n')) FROM t1 LIMIT 1;
505-
} {X'02000000'}
506-
510+
} $res
507511
do_execsql_test 15.2 {
508512
DELETE FROM t1_content WHERE rowid=1;
509513
SELECT quote(matchinfo(t1, 'n')) FROM t1 LIMIT 1;
510-
} {X'02000000'}
514+
} $res
511515

512516
fts5_aux_test_functions db
513517
do_execsql_test 15.3 {
@@ -517,4 +521,3 @@ do_execsql_test 15.3 {
517521
}
518522

519523
finish_test
520-

‎ext/misc/btreeinfo.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
** rootpage INT, -- The root page of the btree
2424
** sql TEXT, -- SQL for this btree - from sqlite_master
2525
** hasRowid BOOLEAN, -- True if the btree has a rowid
26-
** nEntry INT, -- Estimated number of enteries
26+
** nEntry INT, -- Estimated number of entries
2727
** nPage INT, -- Estimated number of pages
2828
** depth INT, -- Depth of the btree
2929
** szPage INT, -- Size of each page in bytes

0 commit comments

Comments
 (0)