Skip to content

Commit 29b7811

Browse files
sjlombardosjlombardo
committed
Merge branch 'sqlite-release' into integration
Conflicts: Makefile.in test/quick.test
2 parents 4f320b6 + 7b63a4e commit 29b7811

File tree

245 files changed

+28016
-5398
lines changed

Some content is hidden

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

245 files changed

+28016
-5398
lines changed

‎Makefile.in‎

Lines changed: 222 additions & 127 deletions
Large diffs are not rendered by default.

‎Makefile.vxworks‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,7 @@ TESTSRC = \
386386
$(TOP)/src/test_server.c \
387387
$(TOP)/src/test_tclvar.c \
388388
$(TOP)/src/test_thread.c \
389+
$(TOP)/src/test_vfs.c \
389390
$(TOP)/src/test_wsd.c \
390391

391392
#TESTSRC += $(TOP)/ext/fts2/fts2_tokenizer.c
@@ -624,7 +625,7 @@ fulltest: testfixture$(EXE) sqlite3$(EXE)
624625
./testfixture$(EXE) $(TOP)/test/all.test
625626

626627
soaktest: testfixture$(EXE) sqlite3$(EXE)
627-
./testfixture$(EXE) $(TOP)/test/all.test -soak 1
628+
./testfixture$(EXE) $(TOP)/test/all.test -soak=1
628629

629630
test: testfixture$(EXE) sqlite3$(EXE)
630631
./testfixture$(EXE) $(TOP)/test/veryquick.test

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.6.23.1
1+
3.7.0

‎configure‎

Lines changed: 11 additions & 10 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.62 for sqlite 3.6.23.1.
3+
# Generated by GNU Autoconf 2.62 for sqlite 3.7.0.
44
#
55
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
66
# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -743,8 +743,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
743743
# Identity of this package.
744744
PACKAGE_NAME='sqlite'
745745
PACKAGE_TARNAME='sqlite'
746-
PACKAGE_VERSION='3.6.23.1'
747-
PACKAGE_STRING='sqlite 3.6.23.1'
746+
PACKAGE_VERSION='3.7.0'
747+
PACKAGE_STRING='sqlite 3.7.0'
748748
PACKAGE_BUGREPORT=''
749749

750750
# Factoring default headers for most tests.
@@ -1487,7 +1487,7 @@ if test "$ac_init_help" = "long"; then
14871487
# Omit some internal or obsolete options to make the list less imposing.
14881488
# This message is too long to be a string in the A/UX 3.1 sh.
14891489
cat <<_ACEOF
1490-
\`configure' configures sqlite 3.6.23.1 to adapt to many kinds of systems.
1490+
\`configure' configures sqlite 3.7.0 to adapt to many kinds of systems.
14911491
14921492
Usage: $0 [OPTION]... [VAR=VALUE]...
14931493
@@ -1552,7 +1552,7 @@ fi
15521552

15531553
if test -n "$ac_init_help"; then
15541554
case $ac_init_help in
1555-
short | recursive ) echo "Configuration of sqlite 3.6.23.1:";;
1555+
short | recursive ) echo "Configuration of sqlite 3.7.0:";;
15561556
esac
15571557
cat <<\_ACEOF
15581558
@@ -1670,7 +1670,7 @@ fi
16701670
test -n "$ac_init_help" && exit $ac_status
16711671
if $ac_init_version; then
16721672
cat <<\_ACEOF
1673-
sqlite configure 3.6.23.1
1673+
sqlite configure 3.7.0
16741674
generated by GNU Autoconf 2.62
16751675
16761676
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1684,7 +1684,7 @@ cat >config.log <<_ACEOF
16841684
This file contains any messages produced by compilers while
16851685
running configure, to aid debugging if configure makes a mistake.
16861686
1687-
It was created by sqlite $as_me 3.6.23.1, which was
1687+
It was created by sqlite $as_me 3.7.0, which was
16881688
generated by GNU Autoconf 2.62. Invocation command line was
16891689
16901690
$ $0 $@
@@ -13972,7 +13972,7 @@ exec 6>&1
1397213972
# report actual input values of CONFIG_FILES etc. instead of their
1397313973
# values after options handling.
1397413974
ac_log="
13975-
This file was extended by sqlite $as_me 3.6.23.1, which was
13975+
This file was extended by sqlite $as_me 3.7.0, which was
1397613976
generated by GNU Autoconf 2.62. Invocation command line was
1397713977
1397813978
CONFIG_FILES = $CONFIG_FILES
@@ -14025,7 +14025,7 @@ Report bugs to <bug-autoconf@gnu.org>."
1402514025
_ACEOF
1402614026
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1402714027
ac_cs_version="\\
14028-
sqlite config.status 3.6.23.1
14028+
sqlite config.status 3.7.0
1402914029
configured by $0, generated by GNU Autoconf 2.62,
1403014030
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
1403114031
@@ -14458,7 +14458,8 @@ $debug ||
1445814458
if test -n "$CONFIG_FILES"; then
1445914459
1446014460
14461-
ac_cr=''
14461+
ac_cr='
14462+
'
1446214463
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
1446314464
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
1446414465
ac_cs_awk_cr='\\r'

‎ext/async/sqlite3async.c‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,7 @@ static int asyncRead(
667667
){
668668
AsyncFileData *p = ((AsyncFile *)pFile)->pData;
669669
int rc = SQLITE_OK;
670-
sqlite3_int64 filesize;
670+
sqlite3_int64 filesize = 0;
671671
sqlite3_file *pBase = p->pBaseRead;
672672
sqlite3_int64 iAmt64 = (sqlite3_int64)iAmt;
673673

@@ -690,7 +690,7 @@ static int asyncRead(
690690
}
691691
nRead = MIN(filesize - iOffset, iAmt64);
692692
if( nRead>0 ){
693-
rc = pBase->pMethods->xRead(pBase, zOut, nRead, iOffset);
693+
rc = pBase->pMethods->xRead(pBase, zOut, (int)nRead, iOffset);
694694
ASYNC_TRACE(("READ %s %d bytes at %d\n", p->zName, nRead, iOffset));
695695
}
696696
}
@@ -717,9 +717,11 @@ static int asyncRead(
717717
if( iBeginIn<0 ) iBeginIn = 0;
718718
if( iBeginOut<0 ) iBeginOut = 0;
719719

720+
filesize = MAX(filesize, pWrite->iOffset+nByte64);
721+
720722
nCopy = MIN(nByte64-iBeginIn, iAmt64-iBeginOut);
721723
if( nCopy>0 ){
722-
memcpy(&((char *)zOut)[iBeginOut], &pWrite->zBuf[iBeginIn], nCopy);
724+
memcpy(&((char *)zOut)[iBeginOut], &pWrite->zBuf[iBeginIn], (size_t)nCopy);
723725
ASYNC_TRACE(("OVERREAD %d bytes at %d\n", nCopy, iBeginOut+iOffset));
724726
}
725727
}
@@ -728,6 +730,9 @@ static int asyncRead(
728730

729731
asyncread_out:
730732
async_mutex_leave(ASYNC_MUTEX_QUEUE);
733+
if( rc==SQLITE_OK && filesize<(iOffset+iAmt) ){
734+
rc = SQLITE_IOERR_SHORT_READ;
735+
}
731736
return rc;
732737
}
733738

@@ -1138,7 +1143,6 @@ static int asyncOpen(
11381143
async_mutex_leave(ASYNC_MUTEX_LOCK);
11391144

11401145
if( rc==SQLITE_OK ){
1141-
incrOpenFileCount();
11421146
pData->pLock = pLock;
11431147
}
11441148

@@ -1155,7 +1159,10 @@ static int asyncOpen(
11551159
}
11561160
if( rc!=SQLITE_OK ){
11571161
p->pMethod = 0;
1162+
}else{
1163+
incrOpenFileCount();
11581164
}
1165+
11591166
return rc;
11601167
}
11611168

@@ -1232,7 +1239,7 @@ static int asyncFullPathname(
12321239
if( rc==SQLITE_OK ){
12331240
int i, j;
12341241
char *z = zPathOut;
1235-
int n = strlen(z);
1242+
int n = (int)strlen(z);
12361243
while( n>1 && z[n-1]=='/' ){ n--; }
12371244
for(i=j=0; i<n; i++){
12381245
if( z[i]=='/' ){

0 commit comments

Comments
 (0)