Skip to content

Commit a28129e

Browse files
billymeltdownbillymeltdown
committed
Merge branch 'prerelease' of https://github.com/sqlcipher/sqlcipher into Xcode5
2 parents 3343aaf + 018c0fb commit a28129e

File tree

285 files changed

+34384
-5128
lines changed

Some content is hidden

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

285 files changed

+34384
-5128
lines changed

‎.gitignore‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ xcuserdata/*
1313
/config.log
1414
/config.status
1515
/keywordhash.h
16-
/mkkeywordhash
16+
/mkkeywordhash*
1717
/opcodes.c
1818
/opcodes.h
1919
/parse.c
2020
/parse.h
2121
/parse.h.temp
2222
/parse.out
2323
/tsrc
24-
/testfixture
25-
/lemon
24+
/testfixture*
25+
/lemon*
2626
/libtool
2727
/libsqlite3.la
2828
/libtclsqlite3.la

‎Makefile.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,7 @@ TESTSRC += \
413413
$(TOP)/ext/misc/fuzzer.c \
414414
$(TOP)/ext/misc/ieee754.c \
415415
$(TOP)/ext/misc/nextchar.c \
416+
$(TOP)/ext/misc/percentile.c \
416417
$(TOP)/ext/misc/regexp.c \
417418
$(TOP)/ext/misc/spellfix.c \
418419
$(TOP)/ext/misc/wholenumber.c

‎Makefile.msc‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ NAWK = gawk.exe
472472

473473
# Object files for the SQLite library (non-amalgamation).
474474
#
475-
LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
475+
LIBOBJS0 = vdbe.lo parse.lo alter.lo analyze.lo attach.lo auth.lo \
476476
backup.lo bitvec.lo btmutex.lo btree.lo build.lo \
477477
callback.lo complete.lo ctime.lo date.lo delete.lo \
478478
expr.lo fault.lo fkey.lo \
@@ -485,11 +485,11 @@ LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
485485
memjournal.lo \
486486
mutex.lo mutex_noop.lo mutex_unix.lo mutex_w32.lo \
487487
notify.lo opcodes.lo os.lo os_unix.lo os_win.lo \
488-
pager.lo parse.lo pcache.lo pcache1.lo pragma.lo prepare.lo printf.lo \
488+
pager.lo pcache.lo pcache1.lo pragma.lo prepare.lo printf.lo \
489489
random.lo resolve.lo rowset.lo rtree.lo select.lo status.lo \
490490
table.lo tokenize.lo trigger.lo \
491491
update.lo util.lo vacuum.lo \
492-
vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbesort.lo \
492+
vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbesort.lo \
493493
vdbetrace.lo wal.lo walker.lo where.lo utf.lo vtab.lo
494494

495495
# Object files for the amalgamation.
@@ -713,6 +713,7 @@ TESTEXT = \
713713
$(TOP)\ext\misc\fuzzer.c \
714714
$(TOP)\ext\misc\ieee754.c \
715715
$(TOP)\ext\misc\nextchar.c \
716+
$(TOP)\ext\misc\percentile.c \
716717
$(TOP)\ext\misc\regexp.c \
717718
$(TOP)\ext\misc\spellfix.c \
718719
$(TOP)\ext\misc\wholenumber.c
@@ -1238,6 +1239,9 @@ soaktest: testfixture.exe sqlite3.exe
12381239
fulltestonly: testfixture.exe sqlite3.exe
12391240
.\testfixture.exe $(TOP)\test\full.test
12401241

1242+
queryplantest: testfixture.exe sqlite3.exe
1243+
.\testfixture.exe $(TOP)\test\permutations.test queryplanner
1244+
12411245
test: testfixture.exe sqlite3.exe
12421246
.\testfixture.exe $(TOP)\test\veryquick.test
12431247

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.7.17
1+
3.8.0.1

0 commit comments

Comments
 (0)