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
mistachkin
f74b9e0965
Further work on Windows header file reform.
...
FossilOrigin-Name: 540f5525160b516de282136ca77f909115a51630
2013-11-26 01:00:31 +00:00
mistachkin
8bc5262915
Initial work on isolating usage of the Windows header file.
...
FossilOrigin-Name: 0d42c6b830ee50f45539d73e3948ed3bc50a11d1
2013-11-25 09:36:07 +00:00
mistachkin
1617577e77
Adjust MSVC makefile to avoid using forward slashes in file names.
...
FossilOrigin-Name: facf6deaa61ed2e1744711d621d7f50fe2067803
2013-11-23 04:22:19 +00:00
drh
ad1ca9a792
Add the "speedtest1.exe" test program.
...
FossilOrigin-Name: fb6f0c6d77b2318e6e587951514aea91db128c3c
2013-11-23 04:16:58 +00:00
drh
212c6be141
Merge the skip-scan optimization into the sessions branch.
...
FossilOrigin-Name: 7596d1bf8040f7cefc7b22c5e609acc5d66820bf
2013-11-14 19:18:39 +00:00
drh
e54df42d87
Break out the structure and macro definitions of where.c into a separate
...
header file whereInt.h for easier editing and debugging.
FossilOrigin-Name: c44467124623733aac64096d605f16139b733a7f
2013-11-12 18:37:25 +00:00
drh
cbf1b8ef7d
Merge in the WITHOUT ROWID changes. A few tests are failing now. They will
...
be fixed in a follow-on check-in.
FossilOrigin-Name: 5addd1234ded59ce60fb633b76ac87d483377edd
2013-11-11 22:55:26 +00:00
drh
9ac3c1ea40
Add the "wordcount.c" test program.
...
FossilOrigin-Name: f02ee5463084cef45ae412c51211b66de7e86baf
2013-11-07 18:37:31 +00:00
drh
9327c70f68
Merge the latest trunk changes into the sessions branch. This merge
...
should fix the build for WinRT.
FossilOrigin-Name: e111e4edf9d7b2d4d6d6673a7576801839e9537d
2013-10-15 14:10:44 +00:00
drh
5f8cdac620
Move the tointeger() and toreal() functions out of core and make them into
...
a run-time loadable extension.
FossilOrigin-Name: 9f66dd7e3790c04f0ab724419f5381bd21f9ebad
2013-10-14 21:14:42 +00:00
mistachkin
d5570119b7
Merge updates from trunk.
...
FossilOrigin-Name: a88b5be01e68b26267ff6eb05e931ef2e7fc9f99
2013-10-12 23:39:49 +00:00
mistachkin
0aedc6be45
The split amalgamation option should be disabled by default.
...
FossilOrigin-Name: 7c24d22ffa1e12f3d24cad06b5ff7cc34219b2bb
2013-10-11 23:02:13 +00:00
mistachkin
7651091de5
Enhance debugging support for the split amalgamation files when compiling with MSVC.
...
FossilOrigin-Name: 8ff17c553d8c159fa81c961441e16dbba8da62ba
2013-10-11 23:01:18 +00:00
drh
a63b852992
Synchronize with the trunk.
...
FossilOrigin-Name: 136445ba020c9475d3f5a7843d7d0add98477138
2013-10-10 20:13:18 +00:00
mistachkin
bbff218016
Merge updates from trunk.
...
FossilOrigin-Name: 435ce3b3fc0cffb4d7e6f2694c3100066e19f9ed
2013-09-24 19:07:48 +00:00
mistachkin
36c12888b5
Merge updates from trunk.
...
FossilOrigin-Name: fca799f03ad04b7d36381108ff10e9c7d03656ac
2013-09-12 00:40:54 +00:00
mistachkin
0157e01cc8
Add the ability to generate assembly listing files using the MSVC makefile.
...
FossilOrigin-Name: 6caa2cd10421a85db6740fb2ae8a42b573959562
2013-09-06 21:41:11 +00:00
drh
5f9742e0ff
Merge from trunk: (1) Recent bug fixes (2) STAT4 support (3) win32-longpath
...
support.
FossilOrigin-Name: e7ebc8f74fe91dee26f952fdf49e427b45448667
2013-08-29 15:08:38 +00:00
mistachkin
8bcd3fa75a
Enable finer control of optimizations when compiling with the MSVC makefile. Also, several modularity enhancements to the MSVC makefile.
...
FossilOrigin-Name: 6c709338bc77fbed24a2597eabd88dd8c29b38d7
2013-08-29 01:03:38 +00:00
drh
7fb30bd0dd
Merge in the latest trunk changes, including partial indexes, the MAX_PATH
...
fix in os_win.c, and the sqlite3_cancel_auto_extension() API.
FossilOrigin-Name: 7e1acb390770d1bd189fac7a3a7f96106f96e3a4
2013-08-02 20:44:48 +00:00
mistachkin
f67feefffc
For the MSVC makefile, recompile vdbe.lo and parse.lo first.
...
FossilOrigin-Name: 9e819f0f12b6f2a8e0e7a90251b3115ff1595f25
2013-07-29 19:03:20 +00:00
mistachkin
036acf3644
Add 'queryplantest' target to the MSVC makefile.
...
FossilOrigin-Name: ad0551e039ccaa9e7a28682b756b56ac2b8fef0d
2013-07-20 00:34:31 +00:00
mistachkin
60bdad7f54
Environment variable names in nmake must be in all uppercase.
...
FossilOrigin-Name: 0328e873f2f98ac0aed93ec07ba7e14228cc10e0
2013-07-11 03:09:45 +00:00
mistachkin
4eaa1295c9
More corrects to VS 2013 integration.
...
FossilOrigin-Name: 7a8b0e362b529d54231453046f22e90e651ecdc5
2013-07-10 21:33:25 +00:00
mistachkin
6cdc63d4e3
Use the VisualStudioVersion variable instead of _MSC_VER.
...
FossilOrigin-Name: 603e9db817d457e59e329ad55ac3f1e567759b32
2013-07-10 19:53:49 +00:00
mistachkin
da5b1cd446
More changes to support MSVC 18.
...
FossilOrigin-Name: 29c458e2c21f7c8db727fe8dbd4d154918b53a4e
2013-07-10 19:39:02 +00:00
drh
fd64cedc4b
Bring the sessions branch up-to-date with all the latest trunk changes.
...
FossilOrigin-Name: 086a127236ee99d67513490fb7b5549e8b752c44
2013-06-26 13:31:50 +00:00
drh
def3367e50
Add the percentile() SQL function as a loadable
...
extension in the ext/misc directory.
FossilOrigin-Name: a64d760d9290b1be78cdda7ae66d4f02c3b3fa53
2013-05-28 20:25:54 +00:00
drh
466af9baae
Update the sessions branch to the latest 3.7.17 beta.
...
FossilOrigin-Name: af8057ef5dcaa72dc0d2ab5d1553b06757449fa1
2013-05-17 10:58:08 +00:00
mistachkin
0600663346
Apply compilation fix from [a58af81483] to the other makefiles as well.
...
FossilOrigin-Name: 7e76889d675e4c646158f7f9188d25f155c18876
2013-05-15 20:35:13 +00:00
drh
ec7ecb8c9a
Merge all recent trunk changes into the sessions branch.
...
FossilOrigin-Name: 3879ab1b532828fcc12a50a95b6730faebcb69e9
2013-05-03 18:29:22 +00:00
drh
ea41dc44c5
Added the nextchar.c extension. Minor changes to the spellfix.c extension
...
so that it can be appended to an amalgamation and compiled without duplicating
symbols.
FossilOrigin-Name: 56b9a417f5451631f11c5206d625f11472ee65f9
2013-04-25 19:31:33 +00:00
drh
8416fc7fc7
Added the transitive_closure, ieee754, and amatch extensions.
...
FossilOrigin-Name: 84018099c8715b982cd24ce9221f93c7379e8c08
2013-04-25 16:42:55 +00:00
drh
b7045ab2ed
Move the test_spellfix.c module to ext/misc/spellfix.c.
...
FossilOrigin-Name: de556add10150140981a2e34b3712e96a7c262e3
2013-04-25 14:59:01 +00:00
drh
1fb64af1dc
Fix the MSVC makefile so that it works with the ext/misc/*.c extensions.
...
FossilOrigin-Name: 680822e892f3efdb702eea3b321bc5785239dd56
2013-04-25 14:36:28 +00:00
drh
e50db1c5d2
Convert the fuzzer virtual table into a loadable extension and move it
...
to the ext/misc/fuzzer.c file.
FossilOrigin-Name: c8c69307f60c1d07ac666ae3797b7e3f286fd491
2013-04-25 14:31:46 +00:00
drh
16fb176814
Merge the latest trunk changes into the sessions branch.
...
FossilOrigin-Name: 6994826c0784280f2e9728dfa4185848846d03df
2013-04-22 23:59:06 +00:00
drh
4d648c777b
Update MSCV makefile for the fts3tokenize virtual table. Clear some
...
harmless compiler warnings in the fts3tokenize code.
FossilOrigin-Name: 2b3fed09eb89f1e9d6a5f7487ef526b46eb51490
2013-04-22 17:07:56 +00:00
drh
bc94dbb661
Add the "mptester" target to the makefiles. Make mptester run with
...
synchronous off by default.
FossilOrigin-Name: 1397830bfead3699a7e6b1858ae67ae15259b89e
2013-04-08 14:28:33 +00:00
mistachkin
fde3b1c715
For the clean target, tidy up a couple more generated (or copied) source files.
...
FossilOrigin-Name: 5687e5ee7bafa00d2b353c3eda1e5dfb219cb185
2013-03-29 19:52:04 +00:00
drh
339d6c6d17
Bring makefiles and build scripts into alignment with the sessions branch.
...
No changes to code.
FossilOrigin-Name: d1f41089aba075eef45fd696599e5d3a74c84d0c
2013-03-19 16:12:40 +00:00
drh
e191e2c6d0
Include the sqlite3session.h header file in with sqlite3.h. Make sure
...
the session APIs are all public.
FossilOrigin-Name: ec490336bc6629d3910667ece1bbc4685a199546
2013-03-19 15:23:18 +00:00
drh
c03edc0b62
Adjust the MSVC makefile so that it correctly handles the sessions
...
extension being included in the amalgamation. Import the test case
changes that appeared in 3.7.16 final.
FossilOrigin-Name: 9bac09a99aef5f18386037b409869d760c520d53
2013-03-18 16:24:33 +00:00
mistachkin
38b4daa122
Fix typos in MSVC makefile.
...
FossilOrigin-Name: 2d15c2685750b930c5b7e2f06cb056b24a037967
2013-03-13 19:02:39 +00:00
drh
498dcae0f0
Fix a compiler warning in sqlite3VdbePreUpdateHook().
...
Add sqlite3session.c to the amalgamation.
Fix the Makefile.in to work with sessions.
FossilOrigin-Name: e54b0225f226a163ec874df7d4b738efba12b3a7
2013-03-13 11:42:00 +00:00
drh
3dbfbcf43e
Enhancements to the query planner to exploit transitive relationships in the
...
WHERE clause, and other minor changes to bring the sessions branch into
alignment with the trunk.
FossilOrigin-Name: 82d3d1ae824e1fbc7958657be79231590ec17ace
2013-01-25 02:10:06 +00:00
mistachkin
413c63ba81
Make the 'fs' virtual table module portable to Windows.
...
FossilOrigin-Name: dd473cae5b6ea02b73168b30365f0af5556ee24d
2013-01-17 03:18:14 +00:00
drh
89ded43b36
Merge recent trunk changes into the sessions branch.
...
FossilOrigin-Name: 7e068e39b3b31364271664e0afb1cd95a235c26f
2013-01-03 22:22:55 +00:00
drh
14172743a2
Add the test_regexp.c module containing a cross-platform implementation
...
of the REGEXP operator.
FossilOrigin-Name: 46c8c01b751c1ea7fc02cc35e3b5bb99dbe46c4b
2012-12-31 19:18:38 +00:00
drh
bd36911f4d
Pull the latest trunk changes into the sessions branch, and in particular
...
the collating-sequence refactorization.
FossilOrigin-Name: 4f6d69ae94671df92b976525f75404c01270fef9
2012-12-08 23:37:22 +00:00
mistachkin
48dd9deffe
For the sqlite3-all.c target, use backslashes when calling the splitter script via the MSVC makefile.
...
FossilOrigin-Name: d507648d820cfea70e17f3d21c35c932a2d20367
2012-12-06 04:33:13 +00:00
drh
3dc2b9032f
Pull all the latest trunk enhancements into the sessions branch.
...
FossilOrigin-Name: fce667f2d93a4ba65ccf1e748469576a3cd7ffcc
2012-10-30 21:03:48 +00:00
mistachkin
29b75bd0d1
Modify clean target to handle all VSIX package flavors.
...
FossilOrigin-Name: 023217ea9eea4fea5d3be7707599c6980d4b76f7
2012-10-20 09:35:57 +00:00
drh
036a71a97c
Merge all the latest core changes into the sessions branch.
...
FossilOrigin-Name: 76767d651fe733614b1719aef9ad5ed4568234e4
2012-10-15 14:25:16 +00:00
mistachkin
0ec0744502
Tooling support for including the debug build in the VSIX package.
...
FossilOrigin-Name: de784399ed1f0e27fc875e32719643d19819c8fb
2012-10-12 18:06:07 +00:00
drh
d1102b1ec7
Merge the latest trunk changes, especially the ORDER BY optimizer enhancements
...
but also other fixes, onto the sessions branch.
FossilOrigin-Name: f1fbb8c5bfa84e84e0b8e2872d83b06a0c0d5acc
2012-10-09 14:58:15 +00:00
mistachkin
08c1c3150b
Changes for WinRT compatibility. Also, allow version resource compilation and embedding to be disabled at compile-time.
...
FossilOrigin-Name: 4b0facc13b1026419f9b89dab3453ba43071455c
2012-10-06 03:48:25 +00:00
drh
c4645dacfb
Merge the latest trunk changes (especially "PRAGMA busy_timeout" and the
...
ORDER BY query planner optimizations) into the sessions branch.
FossilOrigin-Name: 6ca8eae1f89d19ee23cbc3a869d85b57d29b4a7d
2012-09-28 13:05:48 +00:00
mistachkin
8ccc6d4076
Modify generation of resource header file for MSVC so that it can work from outside the working directory.
...
FossilOrigin-Name: 20caf80cb3b65e69a99dbc142db8ee435fb2dbdc
2012-09-27 21:03:53 +00:00
mistachkin
c60941f814
Allow SQLite to work on Win32 with SQLITE_OS_WINNT=0 as long as WAL is disabled.
...
FossilOrigin-Name: c1a8557008e56aa9bcb4565e4178fc57295c563d
2012-09-13 01:51:02 +00:00
mistachkin
597a8c5f32
Insert additional tab character.
...
FossilOrigin-Name: 3af7c1a6afacea7b5e47bebce2541aa340c6e946
2012-09-03 11:14:53 +00:00
mistachkin
0f104d5700
Linking and cleaning fixes for the tclsqlite3.exe target in the MSVC makefile.
...
FossilOrigin-Name: 96d43c7a35684cd8ca6ac0d8325193e69f102fb8
2012-09-03 11:01:21 +00:00
mistachkin
4d9d1f4722
Add Win32 version resources to the applicable binaries built by the MSVC makefile.
...
FossilOrigin-Name: e2f27d28b590164bc6b0d856e79c9345e2188d03
2012-09-03 10:32:32 +00:00
dan
7417cefec6
Update with latest trunk changes.
...
FossilOrigin-Name: 87995dc9409482f0a7a367bfc51d78ac0f63b8c3
2012-08-31 14:23:16 +00:00
mistachkin
52fd8e1d0d
Enable the use of a simpler command line when cross-compiling in the MSVC build environment.
...
FossilOrigin-Name: 8ade136a038ee71d741af4a9f9e692fdff4e7911
2012-08-28 01:44:13 +00:00
drh
310874ca00
Merge the latest trunk changes into the sessions branch.
...
FossilOrigin-Name: aa62d6881b5aae64e15dbae70ce8e77bcc2a9f0b
2012-08-25 01:21:36 +00:00
mistachkin
2f7d5d8394
Modify the MSVC makefile to make it easier to select the heap subsystem to use.
...
FossilOrigin-Name: b1dbf490869d7fc55ce797cf80cf3bf7141d2d15
2012-08-22 00:39:34 +00:00
drh
6ddecb753a
Cherry-pick [555fc07]:
...
Changes to the thread routines to disable them when threading is turned
off using sqlite3_config(). Also merge all recent trunk changes.
FossilOrigin-Name: c92b0fe1371e7c20a5fbdf5fa96e30da14c40880
2012-08-21 17:36:44 +00:00
mistachkin
6f92833f9d
Skip defining some WAL specific things in the Win32 VFS code when compiling without WAL support. Also, fix an example command line in the MSVC makefile.
...
FossilOrigin-Name: 61b1ae121782525b37882a559d0fbb7c85237fd5
2012-08-17 11:47:32 +00:00
drh
e22724ee54
Update the threads branch to include all the latest trunk changes.
...
FossilOrigin-Name: f4125771e21f1ca29d5442b5441dacfc06b8032b
2012-08-16 11:24:22 +00:00
drh
16de7f4d32
Merge all the latest trunk changes into the sessions branch.
...
FossilOrigin-Name: fc07a4795e027108674d1d41eb4350df629ddc8b
2012-08-15 16:21:55 +00:00
mistachkin
0b5ae72993
Improve consistency in handling of build outputs and native library paths in the multi-platform build tool for MSVC.
...
FossilOrigin-Name: e71f2de2cc7c4ef5ee31da81b6615886f6e601e7
2012-07-27 23:03:47 +00:00
mistachkin
f2bc4380b2
For the clean makefile targets, delete the generated VSIX file as well.
...
FossilOrigin-Name: d575d9619abd03322b73f89882d6da7c0820f285
2012-07-27 08:33:10 +00:00
mistachkin
fd0ba2aa22
Modify the multi-platform build tool for MSVC to support the latest RC version.
...
FossilOrigin-Name: 95b65883bbf476a17f09ff978df4f51af615baab
2012-07-27 08:21:45 +00:00
mistachkin
31856a35b9
Add tool to build the core DLL for multiple platforms using MSVC.
...
FossilOrigin-Name: e42f5812f142522852f6dc72430bc7afdd6f2ed3
2012-07-27 07:13:25 +00:00
mistachkin
35d8ac980d
Add another define to the MSVC makefile that is sometimes required to build cleanly for WinRT.
...
FossilOrigin-Name: d582cd890d88e873d76a23545bcd49cf093ee9d2
2012-07-24 06:02:35 +00:00
drh
f51446a38c
Add an internal interface that allows the code to take advantage of multiple
...
cores by pushing subcomputations off into separate threads. The interface
is not currently used.
FossilOrigin-Name: 0e4d977a4a07d6de50acbf022c7dd947998b8d96
2012-07-21 19:40:42 +00:00
mistachkin
bd58d5f7a3
Setup the necessary library paths for cross-compilation with MSVC.
...
FossilOrigin-Name: 7fac56ed9feda819e66070bd5e06db8cad77e8bd
2012-06-30 22:22:34 +00:00