drh
c5c67abb9a
Merge the virtual table query planner enhancement, the RTREE cost estimate
...
fix, and the statement journal spill delay enhancement from trunk.
FossilOrigin-Name: 17fd8f3cf0ec565e08403dc8e10a1cffc2bbe165
2016-03-07 17:49:17 +00:00
drh
c2f18adde5
Remove the unused journal.c source file (its function have been subsumed into
...
memjournal.c). Refactor some of the names in memjournal.c. No functional
changes.
FossilOrigin-Name: 5f2a262d3f6b1531001326faf1d3b3d92c20a30a
2016-03-05 15:35:09 +00:00
drh
2606aca80f
Merge recent enhancements from trunk. Default page size is 4096. Writes
...
to statement journals are avoided.
FossilOrigin-Name: 456df3365e2df60e34762f2024bb551538b3f72b
2016-03-04 16:42:43 +00:00
drh
9878fefd6f
Change the default page size for new database files to 4096 (from 1024).
...
Except, when building the testfixture, preserve the legacy page size.
Also fix a comment on SQLITE_MAX_ATTACHED.
FossilOrigin-Name: 2e8a9ca9d3d6efddc31f01074d14acae56568c37
2016-03-04 03:43:10 +00:00
drh
ddebf16f1f
Add the test_bestindex.c file to Makefile.in and Makefile.msc so that
...
"make test" will work again.
FossilOrigin-Name: 6ec6b6a97e62be1abe1e349b5bc04c6f5ae88968
2016-03-04 02:59:35 +00:00
drh
dbc49161c0
Allow the left-hand side of IN operators on virtual tables to have the
...
aConstraintUsage[].omit flag clear.
FossilOrigin-Name: 1622623cbbfc4325c53d731aba78ca9c382ec612
2016-03-02 03:28:07 +00:00
mistachkin
fe41a98fd6
Add 'Replace.exe' to the MSVC clean target.
...
FossilOrigin-Name: c2277fab12d2aecf9e0f69683741a194df17e854
2016-02-27 00:21:44 +00:00
mistachkin
9aeb971ceb
Support generating the '.def' file using the autoconf Makefile for MSVC.
...
FossilOrigin-Name: 3617564cb630ed418badf43d2c0291c11c166d12
2016-02-26 23:13:16 +00:00
mistachkin
9b88ace822
Further refinements to the MSVC batch build process.
...
FossilOrigin-Name: 4e54e9c0fefe417f94a2d95921acf61b1dda5ca4
2016-02-26 21:01:37 +00:00
drh
d3e1af4aa0
Merge all the latest changes from trunk.
...
FossilOrigin-Name: b86590043e17705ada90562cf30f69b3e3ef65a4
2016-02-25 18:54:30 +00:00
mistachkin
56362a5ab7
Enhance clean target in the MSVC makefiles.
...
FossilOrigin-Name: 66a9ad4a6df513f4c35c3d337d4e2e80cd38d586
2016-02-19 19:03:04 +00:00
mistachkin
b0c99afeda
Modify the MSVC batch build tool to support the MSVC autoconf Makefile.
...
FossilOrigin-Name: 72b10e5e7d2db436c7b03cc3735a2e9d0e53ab5d
2016-02-19 05:07:56 +00:00
drh
d8b7d6e44c
Merge the changes for the 3.11.0 release candidate from trunk.
...
FossilOrigin-Name: 4d7a802e73ef0352f840bc8d74c560afb7666ff7
2016-02-13 14:07:56 +00:00
mistachkin
a819aed880
Naming updates for Universal Windows Platform.
...
FossilOrigin-Name: 717c1fc41a2246e27b324a4071073c286bac4efc
2016-02-12 05:19:29 +00:00
mistachkin
e2eb259fce
Prevent 'expanded command line X too long' errors during the batch 'for' loops used for copying files.
...
FossilOrigin-Name: 67ee9b5af10a8b57a37f19ac040e49fdfcec4145
2016-02-11 21:38:05 +00:00
mistachkin
c04c54b842
Enhance the MSVC makefile to enable building 'testfixture' fully from source code.
...
FossilOrigin-Name: 54ff3a26bc45a1c3c0690119e8fd00b02e2a16ba
2016-02-11 21:28:16 +00:00
mistachkin
8988aeef60
In the MSVC makefile, include the working directory so that it can pickup build generated files (e.g. sqlite3.h, etc).
...
FossilOrigin-Name: e9e6000bd2f7e0ef85178db2b5b8f20e4cf0093c
2016-02-10 21:45:25 +00:00
mistachkin
406eeff6ff
Fix MSVC makefile options that enable control-flow guard.
...
FossilOrigin-Name: 51b6823f4c9376d549f572f5a33cac1e4c9783a2
2016-02-09 18:28:20 +00:00
drh
74cf74ab7f
Fix the top-level makefiles to always include SQLITE_ENABLE_EXPLAIN_COMMENTS
...
when building the shell. Still need to fix main.mk and the
amalgamation tarball.
FossilOrigin-Name: 992282399cd2d1fc52ff5a1a4bff59f30b62899a
2016-02-09 17:12:22 +00:00
drh
1a606f8246
Merge enhancements and fixes from trunk.
...
FossilOrigin-Name: f040a5bb62f3473fba6450c97c68f538d1df21ef
2016-02-09 15:44:18 +00:00
mistachkin
e48f1ed9bf
Fix spelling error in MSVC makefile comments.
...
FossilOrigin-Name: 6eab74c9ae57676044b5bc82fa14e92fd2448008
2016-02-08 20:45:37 +00:00
mistachkin
55e88d96ed
More work on Windows 10 SDK integration.
...
FossilOrigin-Name: 1e563c6ebbb02d2e89760c7a7f95aa69964629c6
2016-02-08 20:40:57 +00:00
mistachkin
27b6997e9c
Fix harmless compiler warning in 'srcck1' tool and add it to the clean targets.
...
FossilOrigin-Name: 852a529a8b112049f67a3126f677c06ae4a22d73
2016-02-07 20:39:27 +00:00
drh
fd0d93fd71
Add the sourcetest target to Makefile.msc.
...
FossilOrigin-Name: ab269e720552483c5617906837e294c1be3e0a57
2016-02-07 00:08:08 +00:00
mistachkin
a6f28893ed
More work on Windows 10 SDK integration.
...
FossilOrigin-Name: ebace2c99b6af9230c4bbc31a764c7f397200148
2016-02-05 19:40:23 +00:00
drh
33c1eb6477
Merge all recent enhancements from trunk.
...
FossilOrigin-Name: f3f9200115caf4b356f90ec97c351d1afbcb9bf6
2016-02-02 02:22:30 +00:00
mistachkin
d5be6f01cd
Support building for Windows 10 desktop using 'MinCore.lib'.
...
FossilOrigin-Name: 4bf89891fbb076364dc45a6bf3246efa6bc33d5d
2016-01-27 07:28:33 +00:00
mistachkin
3e7860938b
Add tooling to create an MSVC Makefile capable of building the core library and shell only, using a pre-built amalgamation.
...
FossilOrigin-Name: c46f1a13cb00264d1164399059250884c7be4ea0
2016-01-23 07:53:04 +00:00
mistachkin
4cfea5c794
More work on the MSVC build.
...
FossilOrigin-Name: a79c46bc61a35edbaf6112c26e8052314b0eb16a
2016-01-23 00:07:51 +00:00
mistachkin
a8a1873485
More MSVC makefile cleanup.
...
FossilOrigin-Name: df22556fd75997111e52f96572da8379dfe948be
2016-01-22 22:16:50 +00:00
mistachkin
d7d305a25a
Enable FTS4 when building the shell with the MSVC makefile.
...
FossilOrigin-Name: e4c07df557cd50786b05eecf011bf94708e6e31b
2016-01-22 04:22:36 +00:00
mistachkin
5d4d941e94
Further refinements to the MSVC makefile.
...
FossilOrigin-Name: 67625b963a6f5a0c6dff1a04a323e693569c2d94
2016-01-22 03:54:36 +00:00
mistachkin
edcb4ebba1
MSVC makefile enhancements for use with the Windows 10 SDK.
...
FossilOrigin-Name: ac2e9d3de54d299f92fc35927b6df6d3aaa2dc59
2016-01-22 01:25:15 +00:00
mistachkin
b5a5a23e92
Add 'rbu' to the clean targets.
...
FossilOrigin-Name: f60f025027ab3acdbc97701f81ff9c11c8463022
2016-01-20 18:47:59 +00:00
drh
20f272c96f
Merge recent enhancements from trunk.
...
FossilOrigin-Name: 327af5f644a49b2f41d5456958f9d61a2b704e1c
2016-01-20 11:33:37 +00:00
dan
2cfe049f40
Add a test to verify that the fts3 and fts5 "unicode61" tokenizers are byte for byte compatible.
...
FossilOrigin-Name: 8ec8314354edc9d6f7d1c8a6370fd984a552a52f
2016-01-14 20:05:59 +00:00
mistachkin
83a2253409
Minor adjustments to the MSVC makefile.
...
FossilOrigin-Name: e2cba1bbfdcb24e35b2275e29071d8a4e4943417
2016-01-14 18:01:16 +00:00
drh
cb75bff3f7
Merge the latest fixes and enhancements from trunk.
...
FossilOrigin-Name: 007e5c6df60f9743ac6914332f59925e4a7a861c
2016-01-14 14:48:17 +00:00
drh
7647377f52
Fix harmless compiler warnings in RBU and add RBU to the autoconf and windows
...
makefiles.
FossilOrigin-Name: fabe78c5d8ab353988f6fe0decacd651edc17ec2
2016-01-14 13:22:24 +00:00
drh
f56a2a07ff
Merge changes for version 3.10.0.
...
FossilOrigin-Name: fa4705c91f9650ecd7ec967dbbf0028aabd8a98c
2016-01-06 15:14:53 +00:00
drh
9d4c9824da
Always use -DSQLITE_ENABLE_MEMSYS5 for fuzzcheck so that the --limit-mem
...
option will work.
FossilOrigin-Name: a855697719e288c908ddb7950d32fd17ef546509
2016-01-05 03:39:52 +00:00
drh
8de1d77c60
Merge the latest enhancements from trunk.
...
FossilOrigin-Name: c0be246a740c8f33a7c07e1414688364dee56ece
2016-01-01 13:25:06 +00:00
mistachkin
b9becaa268
Fix even more harmless compiler warnings.
...
FossilOrigin-Name: 1d0e6aa119da8e15d35508f5d75ffc729979da92
2015-12-16 23:30:30 +00:00
drh
1bb15fc973
Merge recent enhancements from trunk.
...
FossilOrigin-Name: d1a1278d7f3306536dc9cbd8fb300898f1e373e8
2015-12-02 20:40:26 +00:00
mistachkin
92af1ebc75
Add experimental support for the 'test_fs' test module on Win32.
...
FossilOrigin-Name: f3ffb3aeea95712e92919fd5071741327add9643
2015-11-30 23:29:07 +00:00
drh
769dc6e2a2
Merge the latest enhancements from trunk.
...
FossilOrigin-Name: 7d6cfc79e7e5534ebacd980479917bc528a638f7
2015-11-19 19:40:40 +00:00
drh
82415f2d8d
Change the parser to use the standard "lempar.c" template over in the tool/
...
folder rather than the customized "lempar.c" found in src/.
FossilOrigin-Name: 0a72991f4e54548f6c3268c5a9cac1c8d6437d26
2015-11-09 19:33:42 +00:00
drh
d286b9fb7d
Merge all the latest enhancements from trunk.
...
FossilOrigin-Name: 395a153ff7b3c7a72f3d02b6fe76d72383f4e480
2015-10-30 16:50:00 +00:00
mistachkin
1dfaa5c4b2
Fix compilation of 'testfixture' with MSVC when the FTS5 and JSON1 extensions are enabled.
...
FossilOrigin-Name: e31aa97a9298e49507256036cfb8fa7517a48461
2015-10-21 22:07:25 +00:00
mistachkin
f170ea44d4
Enhancements to the MSVC makefile.
...
FossilOrigin-Name: 39e8a5d93fa370afb03223bf0c20ea0f3448b9fc
2015-10-16 20:13:57 +00:00
mistachkin
8873996b7b
In the MSVC makefile, add LIBTCLPATH variable to make it easier to run tests when the Tcl library is not already present in the PATH.
...
FossilOrigin-Name: 54127602b9a555f73f5e446b91e460386cb8fb17
2015-10-14 23:04:08 +00:00
mistachkin
460cd9ccfd
In the MSVC makefile, make sure LDFLAGS is used for the tool executables as well.
...
FossilOrigin-Name: 0a17ee49c6895256fefd13425b790414935efb9d
2015-10-14 22:46:37 +00:00
drh
fdefc36792
Update makefiles to remove all uses of "awk" - to make building SQLite easier
...
on Windows systems. The only requirements now are tclsh, a C compiler, and
common file utilities.
FossilOrigin-Name: 4bd0d43db7c1877f2d8a8d2f2a48f24a10f0c3b8
2015-10-14 20:03:00 +00:00
mistachkin
78e3f61f22
Enable cross-compiling the various tool EXEs with MSVC.
...
FossilOrigin-Name: 7d77233389c595237d5b3d244b8aeca1524290c0
2015-10-14 20:01:12 +00:00
mistachkin
5b66350ac7
Enhance TclKit batch tool (and MSVC makefile) to support targets that require the Tcl stub library.
...
FossilOrigin-Name: bc6223b1d6c31a47c7b734cfb8a9ecf15ab809fc
2015-10-10 23:39:55 +00:00
mistachkin
ba461cac7b
Remove a couple superfluous double quotes in the MSVC makefile.
...
FossilOrigin-Name: 0f9e205b28e013412b19dfd588f2a6cf341c40e8
2015-10-10 02:06:05 +00:00
mistachkin
946ef60ad0
Fix typo in the MSVC makefile. Replace remaining uses of AWK in the MSVC makefile with a Tcl script.
...
FossilOrigin-Name: f8c2193b64979a2fe480fcf913573b5fac06235e
2015-10-10 01:55:57 +00:00
drh
973bc6f1a8
Merge the version 3.9.0 changes and the incorporation of JSON1 and FTS5
...
into the amalgamation from trunk.
FossilOrigin-Name: c1d96fb654b2c0f66d586aa39d80ea0468186690
2015-10-09 15:29:24 +00:00
mistachkin
8381be4ace
In the MSVC makefile, adjust the names of two nmake variables for consistency.
...
FossilOrigin-Name: 92aa4b6b6fbb83f965e4c4be0aa21a8b7e330ed8
2015-10-09 14:23:56 +00:00
drh
64db184efa
Fix a typo in the MSVC Makefile
...
FossilOrigin-Name: c8a12082380991781b5ecd2f479ec65600f4f695
2015-10-09 13:29:27 +00:00
drh
50065656f7
First attempt to add json1 and fts5 to the amalgamation. This check-in does
...
not compile.
FossilOrigin-Name: d820a1bd1b8dd702d1b3a099af393530cc5a5d51
2015-10-08 19:29:18 +00:00
drh
48cc9a31e1
Convert the tool/tostr.awk script into tool/tostr.tcl. Remove two obsolete
...
Makefiles. Purge NAWK from the configure script and from unix makefiles.
There are still two uses of NAWK in Makefile.msc.
FossilOrigin-Name: 5b6775215327a89232f5059653747a18e83b8b4b
2015-10-07 12:36:42 +00:00
drh
60a15a48c5
Change the addopcodes.awk script into tool/addopcodes.tcl.
...
FossilOrigin-Name: 8bbf37142ef2759274668f6da114b5c8072e42db
2015-10-07 12:21:14 +00:00
drh
7651e0a439
Convert the mkopcodec.awk script into tool/mkopcodec.tcl.
...
FossilOrigin-Name: 1506cb33fcf61e2ef97b35b99e58fbf21f4f5496
2015-10-07 12:11:36 +00:00
drh
b15393b8d5
Change mkopcodeh.awk into tool/mkopcodeh.tcl.
...
FossilOrigin-Name: ed0ebc460b54939862e3bddee2bb9bcb9f69c747
2015-10-07 02:52:09 +00:00
drh
32af5eda6a
Merge recent enhancements from trunk, and especially the fix for
...
ticket [1b266395d6bc10].
FossilOrigin-Name: b2face9aa95ade96a5666c70b6b31064c1ad0977
2015-09-30 14:50:39 +00:00
drh
2f20e13b83
Enable adding JSON1 by appending the json1.c source file to the amalgamation
...
and compiling with -DSQLITE_ENABLE_JSON1
FossilOrigin-Name: 33404b2029120d4aabe1e25d484871810777e934
2015-09-26 17:44:59 +00:00
drh
9ec0efd946
Merge all the latest trunk enhancements into the sessions branch.
...
FossilOrigin-Name: c91065f8edb1e54076791716fc20d3fcfe3070dc
2015-09-24 14:26:51 +00:00
drh
64ff56f91a
Capture AFL-generated fuzz tests for json1.c into the test/fuzzdata4.db file.
...
FossilOrigin-Name: 10a214fdb3c13b25e0bdd15c975c21c8890c47ee
2015-09-23 11:59:50 +00:00
mistachkin
357e42d48f
For MSVC, have the 'sqlite3.c' target depend on 'sqlite3ext.h' as well as other targets may depend on this behavior (e.g. extensions).
...
FossilOrigin-Name: 737ac3faf4e5fcb5855f5f9a1c1ddfc5424e6292
2015-09-21 23:53:42 +00:00
mistachkin
c978f2d2c2
Fix compilation under older versions of MSVC.
...
FossilOrigin-Name: 17150ada1474e70d7c5ffe6ba5667f45671a434b
2015-09-21 23:49:35 +00:00
drh
8911c0b339
Adjust Makefiles to use SQLITE_CORE when statically linking json1.c into
...
test shells.
FossilOrigin-Name: 91682ac39e7db6a5dc8b75695a757449f068184a
2015-09-19 16:45:43 +00:00
drh
d7f2beab86
Include json1.c in fuzzcheck and fuzzershell.
...
FossilOrigin-Name: c4b68eff7f8f5402a9abf378157767b1c96a6101
2015-09-19 14:32:51 +00:00
drh
5969c657ae
Merge recent enhancements from trunk.
...
FossilOrigin-Name: cb77236673e30af1e8749d984dedecc8f901b255
2015-09-01 18:52:35 +00:00
drh
3be094df69
Link the json1 extension into the command-line shell by default.
...
FossilOrigin-Name: 2e8e239cec5a12ac81cf62c0fbe94fb5713c31b1
2015-08-29 19:03:33 +00:00
drh
6fd5c1e0e8
Fixes for compiler warnings and errors in the makefiles. Rename the
...
one test script to json101.test.
FossilOrigin-Name: 9ff6ccde5f26f18073587c320290570854ffc833
2015-08-21 20:37:12 +00:00
drh
89a10b2d53
Merge recent trunk enhancements, include table-valued functions.
...
FossilOrigin-Name: e9196d566690de0e9815f8cd85be7844322b5a79
2015-08-20 23:54:25 +00:00
drh
03726aaf7f
Merge support for table-valued functions.
...
FossilOrigin-Name: 96a5d44d9fcb7b159c04630ad2d956fe27df5a43
2015-08-19 18:31:11 +00:00
drh
398f872d1f
Virtual table modules with a null xCreate method act as eponymous-only modules -
...
they cannot be used in a CREATE VIRTUAL TABLE statement. Add the series.c
extension that implements a postgres-like generate_series virtual table to
demonstrate this capability.
FossilOrigin-Name: c58426dbd5ea8b8440ebcc1214f79fa63d658216
2015-08-19 13:54:20 +00:00
drh
5fa5c10784
Begin adding an extension that provides JSON SQL functions.
...
FossilOrigin-Name: dde8afdd8dba1d92560326dca7c1cdfedbe5e070
2015-08-12 16:49:40 +00:00
dan
d3789c0028
Add new test file fts5_test_mi.c, containing an implementation of a function similar to FTS4 matchinfo() for FTS5.
...
FossilOrigin-Name: 4f9520a9dc9c667b7fda5b0822de2bf48184ac99
2015-08-04 20:29:00 +00:00
drh
87c44ef2f7
Merge test improvements and minor fixes from trunk.
...
FossilOrigin-Name: 0298a9a780695b666e7c683700d9f2f889d6f826
2015-07-24 22:21:01 +00:00
drh
a523e31a87
New makefile target "fastfuzztest" runs the same tests as "fuzztest" but
...
with a 100M memory size limit. This more than doubles the speed. The
original unlimited "fuzztest" is still run on a "fulltest".
FossilOrigin-Name: cfeb1b1c294c58222549d06819e9df2e300388fd
2015-07-24 17:26:13 +00:00
drh
53e66c3cda
More robust handling of zeroblob() with oversized arguments. Fix fuzzcheck
...
so that it can be run with limited heap memory.
FossilOrigin-Name: 4e3e516a42059c97f42a7eb59bdf5cded0ff843a
2015-07-24 15:49:23 +00:00
drh
244c8d7077
Merge all changes in the latest 3.8.11 beta into the sessions branch.
...
Changes include the rename of OTA to RBU, the WITHOUT-ROWID-OR-Skipscan fix,
and improvements to pcache1.
FossilOrigin-Name: 7f0ee77062d2fcb014942c7c62c163ccc801f21b
2015-07-23 21:59:58 +00:00
drh
cfb8f8d6a9
Change the name of the OTA extension to RBU: Resumable Bulk Update.
...
FossilOrigin-Name: 017c5019e1ce042025d4f327e50ec50af49f9fa4
2015-07-23 20:44:49 +00:00
mistachkin
bc50bb7f53
Further refine FTS5 cleanup in Makefiles.
...
FossilOrigin-Name: b53a95063cf6b8ee8cad77e9fff4c50a356c43bb
2015-07-14 21:56:53 +00:00
drh
38151adfe2
Merge trunk changes, including the addition of FTS5 and pcache1 performance
...
enhancements.
FossilOrigin-Name: db4cbefb8674c6cfff27c1e918741de1885c845c
2015-07-14 15:39:22 +00:00
mistachkin
ebad80e373
Refine cleaning of FTS5 files by Makefile targets.
...
FossilOrigin-Name: e548d77b3c91cdf11c78d1a688fd768e209bdbf5
2015-07-14 00:36:34 +00:00
mistachkin
68b134c73a
Sync up Makefile clean targets for FTS5.
...
FossilOrigin-Name: 43ead44ef6416d69602e123c3be7a258772837f1
2015-07-04 00:04:37 +00:00
mistachkin
82194aa6e2
Update clean target in MSVC makefile.
...
FossilOrigin-Name: e6c03e72010e919dbac2055b6c3f3b13b1663b15
2015-07-03 23:12:33 +00:00
dan
a153bbc4c2
Copy fts5.h into the build directory as part of building fts5.c. Also remove code to edit fts5parse.c from various Makefiles and add it to mkfts5c.tcl.
...
FossilOrigin-Name: 4d8f03dc7b6529cf8d46fc0fcc82112c0394dc13
2015-07-02 20:12:34 +00:00
drh
bed6de557a
Merge in the latest enhancements from trunks, especially the use of
...
_byteswap_ulong() and similar intrinsics on MSVC.
FossilOrigin-Name: 85ca4409bdca7aee801e9fba1c49a87fabbf2064
2015-07-02 18:47:12 +00:00
mistachkin
ae6ca8e0ed
Simplify FTS5 handling in the MSVC makefile.
...
FossilOrigin-Name: f022e04343fc166a71b315d5aabbc5cc075a4767
2015-07-02 16:50:43 +00:00
dan
3f09beda45
Remove "#ifdef SQLITE_ENABLE_FTS5" from individual fts5 source files. Add a single "#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS5)" to fts5.c.
...
FossilOrigin-Name: 7819002ed85497bbd0f9cf4d39df641573324436
2015-07-02 15:52:21 +00:00
drh
59b4bd4840
Merge all the latest enhancements from trunk. This merge include FTS5
...
and a number of notable performance enhancements.
FossilOrigin-Name: 39936b33b0668aad81aa574d4d74c92b0ddd218a
2015-06-30 16:29:59 +00:00
mistachkin
95ae9587f1
Treat compilation of FTS5 for the loadable extension specially with MSVC.
...
FossilOrigin-Name: 7c610276bb41dbc80fe169d35fe9a3a3f6525635
2015-06-26 20:45:43 +00:00
mistachkin
a468027c8d
Merge upstream changes. Get the test fixture working with FTS5. Fix compiler warnings.
...
FossilOrigin-Name: bfcd16089cf8c65130c011a9718bf7812685c841
2015-06-26 16:55:55 +00:00
mistachkin
b39e8cf239
Add FTS5 DLL target for MSVC.
...
FossilOrigin-Name: be85b82499f63dce4378f29adf8366651e965325
2015-06-26 16:17:36 +00:00
mistachkin
ed52f9ff48
Initial changes to get FTS5 working with MSVC.
...
FossilOrigin-Name: ef2052f81e33ca98e85a60f8a78cdd19a7c1c35c
2015-06-26 04:34:36 +00:00
drh
60c97e6aa8
Merge recent trunk enhancements and fixes.
...
FossilOrigin-Name: c39cb0e2571f58c87053de009e2c135d71b2c3af
2015-06-11 18:01:29 +00:00
mistachkin
033eb6c8d3
Fix minor typo in the quicktest MSVC makefile target.
...
FossilOrigin-Name: 75b65f9d49daaf48e97042cb82ea554e2ec74eec
2015-06-10 22:03:40 +00:00
drh
905da63a82
"test" targets on all makefiles use --verbose=file --output=test-out.txt.
...
Add the new "quicktest" target to all makefiles - designed to run in under
three minutes. The --quick option on releasetest.tcl now uses quicktest.
FossilOrigin-Name: 6ddef2ad35ceb5822fc14c65bc7c6a2662edb63c
2015-06-10 18:53:09 +00:00
drh
38b4149ca1
Factor out the TreeView parse tree printing module into a separate file.
...
FossilOrigin-Name: c32ce54ca46a4be4373983be6fd44b1f3a0250d1
2015-06-08 15:08:15 +00:00
drh
6c1f4ef217
Split more subfunctions of where.c out into a new whereexpr.c source file,
...
for improved maintainability.
FossilOrigin-Name: 46ef95c108ad8961f2bf3d2dc839d4fb1fddd770
2015-06-08 14:23:15 +00:00
drh
6f82e85a80
Split out the bulk of the actual VDBE code generation logic from where.c
...
into a new file, leaving behind the analysis logic. This makes the original
where.c smaller and hopefully easier to edit.
FossilOrigin-Name: faa0e420e93a2bc1c84df9eb9fef4748d29ce339
2015-06-06 20:12:09 +00:00
drh
ad2c1dd782
Import recent enhancements from trunk.
...
FossilOrigin-Name: 54bec164ebeaf62d783352b3c4d0de8845394091
2015-05-29 19:04:58 +00:00
drh
ea93c7005d
The "make fuzztest" target now uses fuzzcheck instead of fuzzershell.
...
FossilOrigin-Name: 4a5f6f1f0128657fd8d4d99d0682edd5bac2a19e
2015-05-26 18:15:08 +00:00
mistachkin
27b1c8ac09
Silence harmless compiler warnings when building the command line utilities with MSVC.
...
FossilOrigin-Name: d26060c468cc6997e9933d9623a47fcc7d86c2da
2015-05-26 03:31:46 +00:00
mistachkin
7a94e6b061
Add fuzzcheck to makefile clean targets. Also, for consistency, replace a few tabs with spaces.
...
FossilOrigin-Name: eda2a437506f148bcb5bb33baa64b5ad8ae73ada
2015-05-26 03:24:33 +00:00
drh
1573dc3bb1
Add fuzzcheck to all makefiles and fix compiler warnings.
...
FossilOrigin-Name: 7b3d21906a9650377cda56b94facdff75b2cb858
2015-05-25 22:29:26 +00:00
drh
dbbd816059
Merge the Makefile.msc fix and the compiler warning fix from trunk. Also
...
fix another compiler warning in sqlite3session_diff().
FossilOrigin-Name: 7530e1bf557083ef91447a02f05b019dbe60fa70
2015-05-19 23:04:26 +00:00
drh
7ac07bda73
Fix the MSVC makefile so that it works with OTA. Fix a harmless compiler
...
warning in FTS3.
FossilOrigin-Name: c7b16645307d6e46c4153693d6806269de64955f
2015-05-19 22:56:45 +00:00
drh
adf3bf5811
Merge recent trunk changes, include the R-Tree enhancement that allows
...
8-byte BLOB arguments to geometry functions, and the fix for the TEXT affinity
problem that could cause corrupt indexes.
FossilOrigin-Name: 0a0de8b72ca24f287f9c84766a14e12ea4564b59
2015-05-19 22:42:23 +00:00
mistachkin
8dd3ff1fb5
Improve the clean target in the MSVC makefile.
...
FossilOrigin-Name: 2c1039d454e359b0eec3db2d4201b4ba7e543052
2015-05-16 03:41:41 +00:00
drh
5f9a57fc49
Merge in the IS-operator enhancements and other recent changes from trunk.
...
FossilOrigin-Name: 4f9229445c293b39c80b2a662901f608c85b36ef
2015-05-14 15:17:20 +00:00
mistachkin
13a24f841c
Enhancements to the MSVC makefile.
...
FossilOrigin-Name: 59e3e9e764440b7feaafadff74f422535d21bca2
2015-05-13 04:50:30 +00:00
mistachkin
d4ab1034c2
Fix minor Makefile typos. Improve consistency of MSVC makefile. Add new targets to clean.
...
FossilOrigin-Name: f84fbe98994c602de6c0b242dcbad3ab77298425
2015-05-11 16:27:33 +00:00
drh
f4375446d1
Build the sqlite3_analyzer.exe and sqldiff.exe programs on "make test"
...
and "make smoketest" and other similar test targets.
FossilOrigin-Name: 1b83f2e7ddfdb488e732731f7a184d37edcad5af
2015-05-11 12:15:45 +00:00
drh
d689fd3a92
Merge all trunk enhancements and fixes into the sessions branch.
...
FossilOrigin-Name: de7083cfe2bb00b689bec6bcc75e994f564ceda6
2015-05-05 17:12:27 +00:00
drh
1a4a680a38
Rename the test_stat.c source file to dbstat.c and rework the makefiles to
...
make dbstat.c a first-class source module.
FossilOrigin-Name: a24480a474993f82ff58edbe12d2093c59b1a2dc
2015-05-04 18:31:09 +00:00
drh
84ab95395e
Include the "dbstat" virtual table in the amalgamation.
...
FossilOrigin-Name: fc6504aa8ca19b3737f72c1e20db8df6b7608dd2
2015-05-04 17:06:39 +00:00
drh
b3df0c675c
Enhance fuzzershell to accept multiple input files. Add the test/fuzzdata2.txt
...
fuzz test content.
FossilOrigin-Name: ab5523aafe4817232388d28ea99be0953e7dccf3
2015-05-01 19:21:12 +00:00
drh
b4a91a9a88
Improved support for OSTRACE on Windows.
...
FossilOrigin-Name: ca43812bde499a23244e2860d3ceddc97d29f09e
2015-04-29 00:35:07 +00:00
drh
f332071b7f
Add the fuzzoomtest target to the makefiles. Invoke fuzzoomtest from
...
releasetest.tcl.
FossilOrigin-Name: f60657c2ae8a11f1e546c953bca07d9396142f73
2015-04-25 13:39:29 +00:00
drh
f1e1736fe1
Add the fuzztest target to the MSVC makefile.
...
FossilOrigin-Name: 98edc6152cdd935dc83c1330c088145e7adb9dd0
2015-04-24 16:16:31 +00:00
drh
6ea60c7c53
Merge the latest trunk enhancements and fixes into the sessions branch.
...
FossilOrigin-Name: 4e5f17d189eb0578a544c21fc150f9e2ee3428e3
2015-04-23 13:49:53 +00:00
mistachkin
318d38cf7e
When compiling for UAP, link against the new minimal MSVC runtime.
...
FossilOrigin-Name: 2cb945116e7a5b78741b19839899826b539d5868
2015-04-22 01:33:53 +00:00
drh
850b0d031d
Merge all recent trunk enhancements and fixes into the sessions branch.
...
FossilOrigin-Name: b8ef1cdee307441e8d97b4bfc21f8547692eea9f
2015-04-20 01:32:53 +00:00
mistachkin
6bbe3dfaf2
Work in progress on making VSIX packages for the Visual Studio 2015 CTP.
...
FossilOrigin-Name: 8469d651a0442a2bc572a869a0457a6ea8c06bc7
2015-04-19 06:18:10 +00:00
drh
268e72f936
Add the tool/fuzzershell.c utility program.
...
FossilOrigin-Name: db8d9af4d04ee862995ffa13ae6dcd9a1fc72855
2015-04-17 14:30:49 +00:00
mistachkin
b10f22a141
Restore SQLITE_FORCE_OS_TRACE to the MSVC makefile, which was removed during a merge.
...
FossilOrigin-Name: c37f4d492f98ac5c07c08705a3826a3e86107306
2015-04-16 16:27:29 +00:00
drh
a9de561b21
Add the --msvc command-line option to the releasetest.tcl script. This is
...
only a partial merge from the winTest branch as the OS_TRACE changes are
omitted.
FossilOrigin-Name: b8768f124ef7d79e500b60a3ede288d46a0f529d
2015-04-15 14:52:05 +00:00
drh
df3c171881
Merge all recent trunk enhancements into the sessions branch.
...
FossilOrigin-Name: 5f14f34f072921e229bc20a5185c0cdb3f464c04
2015-04-12 01:33:37 +00:00
mistachkin
2252917e75
Minor build enhancements for MSVC.
...
FossilOrigin-Name: 40c417a7efb17221cec4a0a703863854bcab8db2
2015-04-10 21:16:11 +00:00
drh
d62c0f4c2d
Add the "sqldiff" utility program.
...
FossilOrigin-Name: 88da5bf5d2c4f848dbd4b5ffb1539abfbbdaff18
2015-04-09 13:34:29 +00:00
mistachkin
00eb70d89c
Enhance the 'releasetest.tcl' tool to support MSVC.
...
FossilOrigin-Name: f664bfdc82597a4530d4f4938bb96557b43b171b
2015-04-04 00:02:07 +00:00
drh
edb3e433ba
Merge recent enhancements from trunk.
...
FossilOrigin-Name: aea439bdc6d4d3a8568423171abf381843188826
2015-04-01 16:39:06 +00:00
mistachkin
eb48b062a1
Testing enhancements on Windows.
...
FossilOrigin-Name: 9cc70eee2e365dd390210f436b893b9d80a19b04
2015-03-31 17:45:44 +00:00
mistachkin
4d2daba467
Minor tweaks to the MSVC Makefile.
...
FossilOrigin-Name: 7244ea59ede8aa2c7d1dc2c85268e12ddd452e27
2015-03-31 16:42:16 +00:00
drh
fe0ba71112
Add the "mptest" target to Makefile.msc
...
FossilOrigin-Name: 1e814e0bd116ad5a05ab9f0ebed7e21b23ed0681
2015-03-31 13:46:13 +00:00
drh
2a07f5ecec
Merge all recent trunk enhancements and fixes into the sessions branch.
...
FossilOrigin-Name: df94e61f93da390cb75c48975c50e9d62096ea0b
2015-03-31 00:10:21 +00:00
mistachkin
34a8065f49
In the MSVC Makefile, make the DYNAMIC_SHELL option work without USE_STDCALL.
...
FossilOrigin-Name: 25b46a9c7e03a84bee2ffddc6d7fd6ae280e9d7b
2015-03-27 00:19:31 +00:00
mistachkin
59b9b02c1f
Add SQLITE_STDCALL and SQLITE_CDECL macros on public function definitions.
...
FossilOrigin-Name: 242f09d4d1c92ee9058857a5e780442f4b7bad55
2015-03-24 21:27:27 +00:00
drh
edea911945
Merge all recent trunk enhancements into the sessions branch.
...
FossilOrigin-Name: 54aaa6f29ad1bf84148c2403eed77e8311f68d66
2015-03-24 19:02:13 +00:00
mistachkin
299903c6a6
Remove superfluous define from the MSVC makefile.
...
FossilOrigin-Name: 880d2513a0fb084fae82080401b108fb13e61478
2015-03-21 02:25:29 +00:00
mistachkin
44723ce096
Improvements to the MSVC build. Fix harmless compiler warnings. Enable use of 'stdcall'.
...
FossilOrigin-Name: 737630b87314283b2c38790ace9d25ec05f81f4a
2015-03-21 02:22:37 +00:00
drh
c11a172d5f
Merge recent trunk enhancements into the sessions branch.
...
FossilOrigin-Name: 68c8937e83b770d5ec6b1855c1bde81057c11b5f
2015-03-09 13:07:45 +00:00
drh
8cd5b2546f
Changes so that the amalgamation and the command-line shell build without
...
modifications on VxWorks 7. Still gives a few compiler warnings, and still
mostly untested on that platform.
FossilOrigin-Name: 7d92f1f11ee69b0ba7d5a48f0611016d77d41c78
2015-03-02 22:06:43 +00:00
mistachkin
8d8738eae0
When cleaning with MSVC, prevent superfluous output regarding 'missing' files and directories.
...
FossilOrigin-Name: 034c16bd24ddca363946a4b8751418469d890d2a
2015-02-25 01:06:08 +00:00
drh
1ee4a2dd88
Merge all the latest enhancements from trunk.
...
FossilOrigin-Name: ae7eef117f28a5dae7a05805f2d31ac532a9fcc5
2015-02-06 15:40:32 +00:00
drh
67e65e55ab
Break out the (script-generated) pragma parsing tables into a separate file,
...
pragma.h, to make editing easier.
FossilOrigin-Name: 32c0325bcb083fe3f0f0cfe999d00f754e15299e
2015-02-02 21:34:54 +00:00
drh
6267920b09
Split up the SRC variable in Makefile.msc to avoid over-long cmd.exe commands when TOP is set to a long pathname.
...
FossilOrigin-Name: 7d70ac65c16f08832a1f0fc4dec0f62a17cbcc85
2015-01-29 18:38:05 +00:00
mistachkin
e45e0fb21c
Enhancements to entropy generation for the Win32 VFS.
...
FossilOrigin-Name: 26190b3c63e18f3116deeb59a58d9b5de48e8eea
2015-01-21 00:48:46 +00:00
drh
7a20f698df
Merge trunk 3.8.8 beta changes into the sessions branch
...
FossilOrigin-Name: 0ba124540b5b2a9ceda0f4f4a46e6be54edad813
2015-01-14 17:16:23 +00:00
mistachkin
32562501a1
Add two more classes of harmless MSVC compiler warnings.
...
FossilOrigin-Name: de30d5b053b8e004418c81945d626cfad315d6ba
2015-01-12 20:20:26 +00:00
mistachkin
27b2f05335
Harmless compiler warning fixes for 'testfixture' and the miscellaneous extensions when built with the MSVC makefile.
...
FossilOrigin-Name: 923fd66031ed1876bc63c3a038f0b8e33678184e
2015-01-12 19:49:46 +00:00
mistachkin
2318d3387d
Work in progress on fixing harmless compiler warnings when using -W4 and MSVC.
...
FossilOrigin-Name: 856dd245ce037f93d5ae2ddeb4fdf949c1e5c8e9
2015-01-12 18:02:52 +00:00
drh
b5a4387097
Merge the PRAGMA data_version redefinition and other fixes from trunk.
...
FossilOrigin-Name: 315243e49d30abd0eb31e3795ecf492aee179e4b
2014-12-22 18:48:48 +00:00
mistachkin
cd54bab6fe
Minor fixes and enhancements to the SQLITE_ENABLE_API_ARMOR functionality.
...
FossilOrigin-Name: cb3e4219ac9560d2773b85453aafda54b7c9346f
2014-12-20 21:14:14 +00:00
drh
c0d33d20f7
Import from trunk the fix the "test" target on the autoconf and MSVC makefiles
...
and some minor compiler warning fixes.
FossilOrigin-Name: c9f20eb2fbba0868df85ebb98877f9bb969be8a4
2014-12-05 00:41:17 +00:00
drh
5de7d966bd
Fix the autoconf and MSVC makefiles, which have been broken for nearly a
...
month. :-(
FossilOrigin-Name: 520c2b838da8b230487c8c66f3ba8e5daa1ca886
2014-12-05 00:17:39 +00:00
drh
04e8a58669
Merge recent trunk enhancements, including the read-after-ROLLBACK change
...
and the addition of sqlite3_stmt_scanstatus() support, as well as various
minor bug fixes.
FossilOrigin-Name: f09055f3c4348264c7336f90646375f0d98b061e
2014-11-18 21:20:57 +00:00
drh
1728bcb07f
Add the eval() SQL function extension in ext/misc/eval.c.
...
FossilOrigin-Name: 27cf665b957f2c0ced403e3032099e80c295598f
2014-11-10 16:49:56 +00:00
drh
bf9ed6f9af
Merge the latest trunk changes, including the multi-threaded sorter, into
...
the sessions branch.
FossilOrigin-Name: d4cce2c71e64ab7b6a65a81b88b69445ed859351
2014-09-02 15:49:47 +00:00
drh
9f674f2600
Fix the autoconf and MSVC makefiles so that they construct the changeset
...
command-line utility upon request. Delete that utility program when
"make clean" is run.
FossilOrigin-Name: 4dc15fe066f079ff31c89a5e0242dd5b3c851d29
2014-08-18 20:23:29 +00:00
drh
2bd2c29a95
Merge all recent trunk changes into the threads branch.
...
FossilOrigin-Name: 770685892c8f09b9cddb2fbb2877cfb291e19425
2014-07-24 16:54:28 +00:00
drh
35c3d8cc75
Merge recent trunk changes into the sessions branch.
...
FossilOrigin-Name: a9db017eabdefafcda87c497e8bafa07002ac0fe
2014-07-24 16:23:51 +00:00
mistachkin
3a046c6c31
Update clean targets with the recently added command-line tools.
...
FossilOrigin-Name: 2beefa68c0c53f663321bebf0ac06f6c936be63f
2014-07-18 21:02:54 +00:00
mistachkin
de54527fb2
Add the fts3view utility program to the MSVC makefile.
...
FossilOrigin-Name: b04751bd59fed513ab615e7f368fe25c64b3607c
2014-07-07 17:57:50 +00:00
drh
6614181610
Merge the latest trunk changes into the threads branch.
...
FossilOrigin-Name: ae23a65eb1547fbe8b86ab71477071990a22d31d
2014-06-30 20:25:03 +00:00
drh
f257b4c613
Merge the latest trunk enhancements into the sessions branch.
...
FossilOrigin-Name: a5d94eaba6aa12ff16d2a0af2fc752bcdb461877
2014-06-30 20:02:55 +00:00
drh
4bb77ecaa8
Add makefile targets for various diagnostic tools, such as showstat4.
...
Fix harmless compiler warnings in diagnostic tools.
FossilOrigin-Name: 6f86d89b8800c50035da7809bff941d08a33a6a2
2014-06-30 11:14:26 +00:00
drh
267a13fd47
Add the "LogEst" and "LogEst.exe" target to the makefiles.
...
FossilOrigin-Name: 7b91b0581d169a353462d96120a2e0d4dcc8e8ae
2014-06-18 18:10:12 +00:00
drh
5dfcfe7dc0
Merge in all recent changes from trunk, and especially the automatic index
...
enhancements.
FossilOrigin-Name: 0e1b73496f861bd497f92f1ead936b2d94aa52d5
2014-06-18 15:18:12 +00:00
drh
51ed298364
Add test cases for the fileio extension.
...
FossilOrigin-Name: 8634333127c4d868d3ec27e88b5818f6479774f3
2014-06-16 12:44:32 +00:00
drh
d963982049
Merge recent trunk changes into the sessions branch.
...
FossilOrigin-Name: 2d33afe0c43cb99caa521c48b721c3b0971e967c
2014-05-20 00:20:23 +00:00
drh
d25c69ef39
Merge all recent changes from trunk, and especially the new sqlite3FaultSim()
...
interface.
FossilOrigin-Name: 43fcbd9116401f30781fdcbe55d1674d6b96311b
2014-05-16 14:27:05 +00:00
mistachkin
a5e2b50d0a
Improve a comment in the MSVC makefile. No changes to code.
...
FossilOrigin-Name: 0901dccedaf5679691ba803ec76d113de170185d
2014-05-12 22:36:50 +00:00
mistachkin
d9b3c549b3
Further MSVC makefile changes to support Windows Phone 8.1.
...
FossilOrigin-Name: a9c81815e1b7a9c05da61f75edac45cb1a954135
2014-05-09 23:31:55 +00:00
mistachkin
4712c21287
When cross-compiling with the MSVC makefile, make sure the correct library path is used. Also, keep track of the required compilation options separately.
...
FossilOrigin-Name: c3dce2e7390eec3a337be1b99f80ad5f721cc647
2014-05-09 20:51:17 +00:00
dan
ae289fccbf
Merge the latest trunk changes into the threads branch.
...
FossilOrigin-Name: 9ac8f1e7115bc50663235adedeb0d3e1234c5740
2014-05-09 15:00:32 +00:00
mistachkin
7dd9fb65e2
When building for Windows 8.0 using Visual Studio 2013, make sure the cross-compilation native library path is set correctly.
...
FossilOrigin-Name: c1ab9092e29bc9d172c1f1a3becbcc83b79f2080
2014-05-05 22:43:17 +00:00
drh
44a3ba7123
Create new header file "os_setup.h" used to detect the operating system
...
at compile-time, and "os_win.h" that contains windows-specific header in
formation.
FossilOrigin-Name: bd92e0f80c1158d810b0d47e38f2fe06ff24bb8c
2014-05-05 20:32:15 +00:00
mistachkin
f6a2342651
Work on cleaning up the MSVC batch build tool integration with Visual Studio 2013.
...
FossilOrigin-Name: b5a72dfd59fba6a9938ac1afdec06a2e6809fd2d
2014-05-05 20:24:34 +00:00
mistachkin
4a11505be9
Merge updates from trunk.
...
FossilOrigin-Name: c4d1d8a0db48f523d1624f2468261c171152c0f7
2014-05-02 21:38:02 +00:00
mistachkin
e500747cfe
Fix typo in Windows makefile. Make sure the WaitForSingleObjectEx system call is always available.
...
FossilOrigin-Name: d7ed529fa2aa5cb13edaabca2acaad06dffef569
2014-05-02 19:12:37 +00:00
dan
c625ba7f4f
Merge latest trunk changes into this branch.
...
FossilOrigin-Name: d17231b63d48c1f9c4dee109c90cec112e2f0fd4
2014-03-13 15:41:09 +00:00
drh
7826a9b83f
Merge the performance enhancements of trunk (and some obscure bug fixes)
...
into the sessions branch.
FossilOrigin-Name: 7f51ad97f0b24c57453d58faf25eee68861faa23
2014-03-04 14:34:14 +00:00
mistachkin
151d05cd39
Fix several small style/consistency issues with the previous check-in.
...
FossilOrigin-Name: 2477b3a294beb35f806a38f3ebc008942ba01617
2014-02-24 21:42:33 +00:00
mistachkin
1925a2e6f8
Enhance testing support for the Win32 VFS dynamic extension loading facilities.
...
FossilOrigin-Name: 53081e7202fb55f792a78e73627466eb0200f11c
2014-02-24 21:20:25 +00:00
mistachkin
835c19bb9a
Merge updates from trunk.
...
FossilOrigin-Name: 09cf240a7fb4022aeb1d7ae2a2455b5f97b53d68
2014-02-21 10:48:03 +00:00
mistachkin
3f40d40ad9
Improvements to the makefile and README for MSVC.
...
FossilOrigin-Name: b22b61406899c2694dae984995d2484fdb8122f1
2014-02-13 21:57:48 +00:00
drh
4b46eb108d
Sync with version 3.8.3.
...
FossilOrigin-Name: a704b65b9476d60c88b5bc82f2743faa2bce5ac2
2014-02-03 13:58:42 +00:00
mistachkin
b04275121c
Enhance the MSVC makefile for better debugging symbol support.
...
FossilOrigin-Name: c723ec2784d6b60c9781a435c84800b2bc7818d5
2014-01-30 11:12:52 +00:00
drh
c8d985e09c
Merge in all recent preformance enhancements from trunk.
...
FossilOrigin-Name: 32477642d79615fb85680bdac812ad9655cf6902
2013-12-14 18:24:46 +00:00
drh
2dc0648a80
Do not run the tool/vdbe-compress.tcl script that generates the
...
vdbeExecUnion object that reduces the size of the sqlite3VdbeExec()
stack frame unless the SQLITE_SMALL_STACK compile-time option is
specified as on of the OPTS in the makefile. The vdbeExecUnion object
gets in the way of C-compiler optimizer and results in slightly slower code.
FossilOrigin-Name: 4d0781473a465b4ab0a307914014f3d2ddd0ce33
2013-12-11 00:59:10 +00:00
drh
65106c77bb
Update to the 3.8.2 release.
...
FossilOrigin-Name: e579661a7950fe9f8eb10012946100c874ba54b0
2013-12-06 15:49:45 +00:00
mistachkin
5fac42002a
Make use of the CC nmake macro even when cross-compiling (with MSVC).
...
FossilOrigin-Name: aae7b30ebd9601882a02fe8cf46fbf0390ec3fac
2013-12-03 23:33:29 +00:00
drh
1b2ee4fe1a
Merge in performance enhancements from trunk.
...
FossilOrigin-Name: fc9ae839569eb28eb734c52d95676c59b2e27494
2013-11-26 18:00:29 +00:00