]> git.ipfire.org Git - thirdparty/sqlite.git/log
thirdparty/sqlite.git
9 years agoMerge updates from trunk. mutexInitCmpSwap
mistachkin [Wed, 23 Sep 2015 15:54:36 +0000 (15:54 +0000)] 
Merge updates from trunk.

FossilOrigin-Name: 6b85f8cd4d87d616a3cb362647ae3869c45c2801

9 years agoCapture AFL-generated fuzz tests for json1.c into the test/fuzzdata4.db file.
drh [Wed, 23 Sep 2015 11:59:50 +0000 (11:59 +0000)] 
Capture AFL-generated fuzz tests for json1.c into the test/fuzzdata4.db file.

FossilOrigin-Name: 10a214fdb3c13b25e0bdd15c975c21c8890c47ee

9 years agoDo not allow a comma at the end of a JSON array or object.
drh [Wed, 23 Sep 2015 01:10:29 +0000 (01:10 +0000)] 
Do not allow a comma at the end of a JSON array or object.

FossilOrigin-Name: 7c7a3f3e9bc2f7a7334d8d6eae183d83f22097be

9 years agoAdd the --export-sql and --export-db options to the fuzzcheck utility program.
drh [Tue, 22 Sep 2015 18:51:17 +0000 (18:51 +0000)] 
Add the --export-sql and --export-db options to the fuzzcheck utility program.

FossilOrigin-Name: 760af4455115669b934c3115d45cffe89c085faf

9 years agoFix a typo in the --help screen of the fuzzcheck utility.
drh [Tue, 22 Sep 2015 17:46:11 +0000 (17:46 +0000)] 
Fix a typo in the --help screen of the fuzzcheck utility.

FossilOrigin-Name: b6ae61fe3b3de3aa296b3e56cd2ec425a5141c73

9 years agoFuther simplifications to json1.c. Also an obscure bug-fix in the initial
drh [Tue, 22 Sep 2015 01:15:49 +0000 (01:15 +0000)] 
Futher simplifications to json1.c.  Also an obscure bug-fix in the initial
output of json_tree() when using a path to an object contained within an array.

FossilOrigin-Name: fcb1e327a64134e5ac539ec3d52733422d3061fd

9 years agoFix json_set() so that it can overwrite a value that was previously overwritten
drh [Tue, 22 Sep 2015 00:21:03 +0000 (00:21 +0000)] 
Fix json_set() so that it can overwrite a value that was previously overwritten
during the same call.

FossilOrigin-Name: 0f16041647993975c316203c7e11f06e27640136

9 years agoFor MSVC, have the 'sqlite3.c' target depend on 'sqlite3ext.h' as well as other targe...
mistachkin [Mon, 21 Sep 2015 23:53:42 +0000 (23:53 +0000)] 
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

9 years agoFix compilation under older versions of MSVC.
mistachkin [Mon, 21 Sep 2015 23:49:35 +0000 (23:49 +0000)] 
Fix compilation under older versions of MSVC.

FossilOrigin-Name: 17150ada1474e70d7c5ffe6ba5667f45671a434b

9 years agoSimplifications to the json1.c logic.
drh [Mon, 21 Sep 2015 22:53:16 +0000 (22:53 +0000)] 
Simplifications to the json1.c logic.

FossilOrigin-Name: 1646a2bd85f87d03a14fcaec288107f5f6411c6f

9 years agoFix an overly-strict assert() in the btree logic.
drh [Sun, 20 Sep 2015 22:57:47 +0000 (22:57 +0000)] 
Fix an overly-strict assert() in the btree logic.

FossilOrigin-Name: 825ce3201df21c6b9d5c57dcc6726c306df05220

9 years agoDo not allow table-valued function syntax to be used on a view.
drh [Sat, 19 Sep 2015 20:27:08 +0000 (20:27 +0000)] 
Do not allow table-valued function syntax to be used on a view.

FossilOrigin-Name: 97cfe346e140e42a604375551f8168276bdbea11

9 years agoAdd the --disable-lookaside option to the fuzzershell utility program.
drh [Sat, 19 Sep 2015 19:36:13 +0000 (19:36 +0000)] 
Add the --disable-lookaside option to the fuzzershell utility program.

FossilOrigin-Name: 0b04374449c8279ad038def7c18cd74f180a0515

9 years agoFix a memory leak in json1.c that could occur after misuse of json_object().
drh [Sat, 19 Sep 2015 18:54:39 +0000 (18:54 +0000)] 
Fix a memory leak in json1.c that could occur after misuse of json_object().

FossilOrigin-Name: 394b81b11f261a9b179a034bc2a2d2dff0765e3b

9 years agoAdd an assert() statement to delete.c.
dan [Sat, 19 Sep 2015 18:11:18 +0000 (18:11 +0000)] 
Add an assert() statement to delete.c.

FossilOrigin-Name: 40fce67ecf0e71db3c8f3da3f72cc80a3d0f8fb2

9 years agoFix compiler warnings.
drh [Sat, 19 Sep 2015 18:08:13 +0000 (18:08 +0000)] 
Fix compiler warnings.

FossilOrigin-Name: 5c31ee62a196b914673384a611534fd778dc64b0

9 years agoAdd json1.c to the fuzzer test shells.
drh [Sat, 19 Sep 2015 16:51:58 +0000 (16:51 +0000)] 
Add json1.c to the fuzzer test shells.

FossilOrigin-Name: 809d67b61164b83bbb6962f0edee1793a483ccab

9 years agoAdjust Makefiles to use SQLITE_CORE when statically linking json1.c into json-fuzz
drh [Sat, 19 Sep 2015 16:45:43 +0000 (16:45 +0000)] 
Adjust Makefiles to use SQLITE_CORE when statically linking json1.c into
test shells.

FossilOrigin-Name: 91682ac39e7db6a5dc8b75695a757449f068184a

9 years agoAdjust fuzzershell so that it adds the json1 extension separately for each
drh [Sat, 19 Sep 2015 14:57:00 +0000 (14:57 +0000)] 
Adjust fuzzershell so that it adds the json1 extension separately for each
no connection.

FossilOrigin-Name: ca2d1e9036387d1514fe596a0b82a3d8409797c3

9 years agoInclude json1.c in fuzzcheck and fuzzershell.
drh [Sat, 19 Sep 2015 14:32:51 +0000 (14:32 +0000)] 
Include json1.c in fuzzcheck and fuzzershell.

FossilOrigin-Name: c4b68eff7f8f5402a9abf378157767b1c96a6101

9 years agoFix a documentation typo in sqlite3_bind_parameter_index(). No code changes.
drh [Sat, 19 Sep 2015 12:04:27 +0000 (12:04 +0000)] 
Fix a documentation typo in sqlite3_bind_parameter_index().  No code changes.

FossilOrigin-Name: 650605a820f3860b1d6e955cdda23aaff01dfdb5

9 years agoFix an off-by-one error (really off-by-2 in this case) in the buffer
drh [Sat, 19 Sep 2015 11:57:26 +0000 (11:57 +0000)] 
Fix an off-by-one error (really off-by-2 in this case) in the buffer
resize logic of json1.

FossilOrigin-Name: d2a027372a5a6efc0f9b6f605093d865ae1c6788

9 years agoDo not allow rowid in a UNIQUE or PRIMARY KEY constraint. (This restores the
drh [Sat, 19 Sep 2015 03:07:30 +0000 (03:07 +0000)] 
Do not allow rowid in a UNIQUE or PRIMARY KEY constraint.  (This restores the
same behavior exhibited by all prior releases.)

FossilOrigin-Name: b1278301e37220a075c1bae88c0fcca2ef7a7d5c

9 years agoFix a crash that can occur with a skip-scan on an index with
drh [Fri, 18 Sep 2015 18:09:28 +0000 (18:09 +0000)] 
Fix a crash that can occur with a skip-scan on an index with
expressions when SQLITE_ENABLE_EXPLAIN_COMMENTS is defined.

FossilOrigin-Name: 25f34cb9b576a2d4250a06a7dbf88010b1c11675

9 years agoAdjustments to the spellfix2.test module so that it works reliably on
drh [Fri, 18 Sep 2015 15:38:07 +0000 (15:38 +0000)] 
Adjustments to the spellfix2.test module so that it works reliably on
windows.

FossilOrigin-Name: 09a313fb7f2c16b0253a439edb901a7bb201d7d3

9 years agoAdjust two test cases so that they conform to the current code.
drh [Fri, 18 Sep 2015 15:35:16 +0000 (15:35 +0000)] 
Adjust two test cases so that they conform to the current code.

FossilOrigin-Name: 228e3d7c8f37c722aee3b589bdd5cfaa4b1f6f03

9 years agoFix sqlilimits.test module so that it knows that the SELECT in a CREATE VIEW
drh [Fri, 18 Sep 2015 15:13:29 +0000 (15:13 +0000)] 
Fix sqlilimits.test module so that it knows that the SELECT in a CREATE VIEW
is not checked until the view is actually used.

FossilOrigin-Name: acf5d87f9456a1d0d69fe0ebc753211e1be07eaf

9 years agoEnsure that "PRAGMA integrity_check" reports an error if the free-list count header...
dan [Fri, 18 Sep 2015 14:45:01 +0000 (14:45 +0000)] 
Ensure that "PRAGMA integrity_check" reports an error if the free-list count header field contains a value smaller than the actual number of pages on the database free-list.

FossilOrigin-Name: 26f64986d1ed59c554a7cb9e00e86a7f148f1fc6

9 years agoFix the orderby9.test case so that it works with 32-bit versions of TCL
drh [Fri, 18 Sep 2015 14:42:48 +0000 (14:42 +0000)] 
Fix the orderby9.test case so that it works with 32-bit versions of TCL

FossilOrigin-Name: 4b6af7743034546a407a3e4722645945a4efc8a1

9 years agoRemove a test made obsolete by the ONEPASS DELETE optimization.
drh [Fri, 18 Sep 2015 14:22:34 +0000 (14:22 +0000)] 
Remove a test made obsolete by the ONEPASS DELETE optimization.

FossilOrigin-Name: c88b62c28cc7ac31b93f7df0c732e0bb6ca24f65

9 years agoAvoid passing (signed char) values directly to isspace(), isalnum() or isdigit()...
dan [Thu, 17 Sep 2015 17:21:09 +0000 (17:21 +0000)] 
Avoid passing (signed char) values directly to isspace(), isalnum() or isdigit() in json1.c. Cast the value to (unsigned char) first.

FossilOrigin-Name: 6713e35b8a8c997aa2717e86ce6dcd63bb993477

9 years agoFix a crash in FTS5 caused by specifying NULL as the rhs of a MATCH operator.
dan [Thu, 17 Sep 2015 09:48:01 +0000 (09:48 +0000)] 
Fix a crash in FTS5 caused by specifying NULL as the rhs of a MATCH operator.

FossilOrigin-Name: e8ed62f82e8acc40b818bf86fafe3d480687514e

9 years agoAdd a "flush" to force incremental output to releasetest-out.txt while running
drh [Wed, 16 Sep 2015 17:46:11 +0000 (17:46 +0000)] 
Add a "flush" to force incremental output to releasetest-out.txt while running
the test/releasetest.tcl. script.

FossilOrigin-Name: 0f3de2d337a3113dbd0765aa5545bb586b780121

9 years agoFix typo in fts5.h.
dan [Wed, 16 Sep 2015 12:31:39 +0000 (12:31 +0000)] 
Fix typo in fts5.h.

FossilOrigin-Name: 07721c6c24f651d8e281c29227b113d292f6b0de

9 years agoAdd test cases to cover fts5 integrity-check code.
dan [Tue, 15 Sep 2015 14:39:17 +0000 (14:39 +0000)] 
Add test cases to cover fts5 integrity-check code.

FossilOrigin-Name: 1d018c35b9e81982df036f5e62a4a42219b54e02

9 years agoReformat some code to make it easier to merge with sessions. No logic changes.
drh [Tue, 15 Sep 2015 13:42:16 +0000 (13:42 +0000)] 
Reformat some code to make it easier to merge with sessions.  No logic changes.

FossilOrigin-Name: eade355fafec558fc13dc4b08ca0b07713a2cd84

9 years agoFix a problem with fts5 "ORDER BY rowid DESC" queries and large terms.
dan [Tue, 15 Sep 2015 11:58:33 +0000 (11:58 +0000)] 
Fix a problem with fts5 "ORDER BY rowid DESC" queries and large terms.

FossilOrigin-Name: b26d8f79c62cb71b4c3ea5df9d0e09558bbbd794

9 years agoImprove test coverage of fts5_index.c.
dan [Mon, 14 Sep 2015 19:51:05 +0000 (19:51 +0000)] 
Improve test coverage of fts5_index.c.

FossilOrigin-Name: c1f76686cee3918b1be785a4071d68cb3afda0ef

9 years agoTestability improvements for the ONEPASS_MULTI enhancement.
drh [Mon, 14 Sep 2015 19:26:37 +0000 (19:26 +0000)] 
Testability improvements for the ONEPASS_MULTI enhancement.

FossilOrigin-Name: d2df93f26fc0cf6fe01acfeaf2946972e9d8cca2

9 years agoFix a typo in an SQLITE_USER_AUTHENTICATION macro.
drh [Mon, 14 Sep 2015 14:49:23 +0000 (14:49 +0000)] 
Fix a typo in an SQLITE_USER_AUTHENTICATION macro.

FossilOrigin-Name: 379455af9fdfb299a857d46f35f0a76ed6daa08a

9 years agoUse symbolic names ONEPASS_OFF, ONEPASS_SINGLE, and ONEPASS_MULTI for the
drh [Mon, 14 Sep 2015 14:45:50 +0000 (14:45 +0000)] 
Use symbolic names ONEPASS_OFF, ONEPASS_SINGLE, and ONEPASS_MULTI for the
various modes of the one-pass optimization.

FossilOrigin-Name: 16e56bdadef903c6439a487f2683388aeeb0c625

9 years agoFix a compiler warning and providing missing VdbeCoverage() calls.
drh [Mon, 14 Sep 2015 14:08:25 +0000 (14:08 +0000)] 
Fix a compiler warning and providing missing VdbeCoverage() calls.

FossilOrigin-Name: 2edd2e5edd60210e18db58bce1e096dd211b6ece

9 years agoUse a single-pass approach for DELETE statements on non-virtual tables that do not...
dan [Mon, 14 Sep 2015 11:09:58 +0000 (11:09 +0000)] 
Use a single-pass approach for DELETE statements on non-virtual tables that do not require trigger or foreign key processing.

FossilOrigin-Name: 8b93cc5937000535c35c763c9326507a19892a6e

9 years agoAvoid calling sqlite3VdbeCursorMoveto() from more than one point in vdbe.c. Doing... onepass-delete
dan [Mon, 14 Sep 2015 09:23:47 +0000 (09:23 +0000)] 
Avoid calling sqlite3VdbeCursorMoveto() from more than one point in vdbe.c. Doing so prevents it from being inlined as part of OP_Column.

FossilOrigin-Name: 166d5af8914c6954fb24a06e9686f194c0d0acde

9 years agoAdd static VFS mutexes to the primary header file comments.
mistachkin [Sun, 13 Sep 2015 20:15:01 +0000 (20:15 +0000)] 
Add static VFS mutexes to the primary header file comments.

FossilOrigin-Name: 9a867d9fbe74fe2b33d55e32737a66e9a77b7466

9 years agoExperimental changes to avoid recusrively calling xMutexInit.
mistachkin [Sun, 13 Sep 2015 18:45:50 +0000 (18:45 +0000)] 
Experimental changes to avoid recusrively calling xMutexInit.

FossilOrigin-Name: c9400ff167d9520119081c9b92436794dcd53d22

9 years agoMerge updates from trunk.
mistachkin [Sun, 13 Sep 2015 18:43:53 +0000 (18:43 +0000)] 
Merge updates from trunk.

FossilOrigin-Name: b42c2e2076da1a61f667876ff2c18e4ebed50a7f

9 years agoFix compiler warnings in delete.c.
dan [Sat, 12 Sep 2015 19:50:58 +0000 (19:50 +0000)] 
Fix compiler warnings in delete.c.

FossilOrigin-Name: 0a4d285e18b78cd529483ba5c8c607ab62a443d4

9 years agoFix API documentation typos. Emphasize that the sqlite3_config() routine is
drh [Sat, 12 Sep 2015 19:27:41 +0000 (19:27 +0000)] 
Fix API documentation typos.  Emphasize that the sqlite3_config() routine is
not threadsafe.

FossilOrigin-Name: 786333e05a75406bbd0b5c9c7beb8f16022eabec

9 years agoExperimental change to use a single-pass approach for DELETE statements on non-virtua...
dan [Sat, 12 Sep 2015 19:26:11 +0000 (19:26 +0000)] 
Experimental change to use a single-pass approach for DELETE statements on non-virtual tables that do not fire triggers or require foriegn-key processing.

FossilOrigin-Name: eaeb2b80f6f8f83679c8323a81bb39570ec946fe

9 years agoMerge updates from trunk.
mistachkin [Sat, 12 Sep 2015 18:58:32 +0000 (18:58 +0000)] 
Merge updates from trunk.

FossilOrigin-Name: d8051f611acabc2aaf8d23e8707c2a45961be416

9 years agoImport common changes from the mutex initialization branch.
mistachkin [Sat, 12 Sep 2015 18:57:45 +0000 (18:57 +0000)] 
Import common changes from the mutex initialization branch.

FossilOrigin-Name: 334720c01722478af0d3dfd6fe8bafd88ba09f49

9 years agoMerge updates from trunk.
mistachkin [Sat, 12 Sep 2015 16:59:38 +0000 (16:59 +0000)] 
Merge updates from trunk.

FossilOrigin-Name: 4859778900a99e7e50ce3d56910ad4c5469f2cdb

9 years agoFix comments.
mistachkin [Sat, 12 Sep 2015 04:22:01 +0000 (04:22 +0000)] 
Fix comments.

FossilOrigin-Name: de3fa51e931d34f341fc3432bfdf97390bb68d4e

9 years agoSpecifying an invalid mutex implementation (via SQLITE_CONFIG_MUTEX) should cause...
mistachkin [Sat, 12 Sep 2015 04:19:51 +0000 (04:19 +0000)] 
Specifying an invalid mutex implementation (via SQLITE_CONFIG_MUTEX) should cause the default one to be used instead.

FossilOrigin-Name: 1a97bc81ccfc88f2dd527dff16e9e395718675bc

9 years agoClarify the new mutex implementation reset logic in sqlite3_shutdown().
mistachkin [Sat, 12 Sep 2015 03:40:13 +0000 (03:40 +0000)] 
Clarify the new mutex implementation reset logic in sqlite3_shutdown().

FossilOrigin-Name: f9a034834e6c6e32ac350cf48bec981490e533ad

9 years agoAdd more asserts to the mutex subsystem.
mistachkin [Sat, 12 Sep 2015 03:35:55 +0000 (03:35 +0000)] 
Add more asserts to the mutex subsystem.

FossilOrigin-Name: 7562f1fbede70b19bbbb928e0a534203528b5b65

9 years agoFix typo in the Win32 implementation of sqlite3CompareAndSwap.
mistachkin [Sat, 12 Sep 2015 01:17:20 +0000 (01:17 +0000)] 
Fix typo in the Win32 implementation of sqlite3CompareAndSwap.

FossilOrigin-Name: 31a26a1dd796e073e847e1e9c636f1976ffbb085

9 years agoMake sure that the mutex implementation can be altered after calling sqlite3_shutdown().
mistachkin [Fri, 11 Sep 2015 23:24:50 +0000 (23:24 +0000)] 
Make sure that the mutex implementation can be altered after calling sqlite3_shutdown().

FossilOrigin-Name: dc2cf8974337ca1ef705aee4efd4a96b91ca3edd

9 years agoUpdate evidence marks due to wording changes in requirements text. No
drh [Fri, 11 Sep 2015 20:54:44 +0000 (20:54 +0000)] 
Update evidence marks due to wording changes in requirements text.  No
changes to code.

FossilOrigin-Name: 86781093bdb4c4fdedd228cb1c8961db48a483bb

9 years agoFix harmless compiler warnings.
mistachkin [Fri, 11 Sep 2015 18:05:01 +0000 (18:05 +0000)] 
Fix harmless compiler warnings.

FossilOrigin-Name: bfc7b84b766860d2e410702ba7c1166d7328309a

9 years agoMore test cases in test/json102.test corresponding to new examples in the
drh [Fri, 11 Sep 2015 15:32:33 +0000 (15:32 +0000)] 
More test cases in test/json102.test corresponding to new examples in the
json1 documentation.

FossilOrigin-Name: f599a42e190b4b89d74055402143c5487985cd90

9 years agoFix some compiler warnings in fts5 code.
dan [Fri, 11 Sep 2015 14:15:46 +0000 (14:15 +0000)] 
Fix some compiler warnings in fts5 code.

FossilOrigin-Name: 0dc436116e55e3fd55eb6085ada71e099069b32d

9 years agoEnhance mutex initialization to prevent possible race conditions between sqlite3_init...
mistachkin [Fri, 11 Sep 2015 05:06:15 +0000 (05:06 +0000)] 
Enhance mutex initialization to prevent possible race conditions between sqlite3_initialize() and sqlite3_config().  Also, re-check sqlite3GlobalConfig.isInit after the mutex subsystem has been initialized.

FossilOrigin-Name: f6a8f577957769171acd72df3cc9aa5ad474d84b

9 years agoUpdates to the sqlite3_value_subtype() and sqlite3_result_subtype()
drh [Fri, 11 Sep 2015 01:22:41 +0000 (01:22 +0000)] 
Updates to the sqlite3_value_subtype() and sqlite3_result_subtype()
documentation and to test cases for json1 dealing with those interfaces.

FossilOrigin-Name: d6cadbe9fefce9a7af6b2d0cb83362f967d7d89a

9 years agoAdd new interfaces sqlite3_value_subtype() and sqlite3_result_subtype().
drh [Fri, 11 Sep 2015 00:26:04 +0000 (00:26 +0000)] 
Add new interfaces sqlite3_value_subtype() and sqlite3_result_subtype().
Update the json1.c extension to take advantages of those interfaces to avoid
the goofy '$$' path syntax and to allow nested calls to json_array() and
json_object() that work as expected.

FossilOrigin-Name: db4152aef2253ed2a33e3cad01e0c6758e03f900

9 years agoTake out the goofy '$$' path syntax. Instead, use subtypes to communicate when subtypes
drh [Fri, 11 Sep 2015 00:06:41 +0000 (00:06 +0000)] 
Take out the goofy '$$' path syntax.  Instead, use subtypes to communicate when
a string is JSON.  Add the json() function that validates and minifies the
JSON and sets the appropriate subtype.

FossilOrigin-Name: 8a80d6459e246ec1b38325e1cbd1e862157138b3

9 years agoMake the sqlite3_value_subtype() and sqlite3_result_subtype() interfaces
drh [Thu, 10 Sep 2015 20:40:21 +0000 (20:40 +0000)] 
Make the sqlite3_value_subtype() and sqlite3_result_subtype() interfaces
available to loadable extensions.

FossilOrigin-Name: c6fca0be11f7414292279e2ea1b004260e6f4bb6

9 years agoExperimental implementation of sqlite3_result_subtype() and
drh [Thu, 10 Sep 2015 20:34:56 +0000 (20:34 +0000)] 
Experimental implementation of sqlite3_result_subtype() and
sqlite3_value_subtype() interfaces.

FossilOrigin-Name: 7b5be299c617a3d3ed327ed30ef0a66a62c85b1f

9 years agoFix a potential NULL pointer deref in the testing logic of pcache1.
drh [Thu, 10 Sep 2015 19:22:25 +0000 (19:22 +0000)] 
Fix a potential NULL pointer deref in the testing logic of pcache1.
NB: The -DSQLITE_TEST compile-time option is needed to hit the problem.

FossilOrigin-Name: f5580f08538636ffb1367e717a33756288ccddde

9 years agoModify the fts5 leaf page format to permit faster seek operations. This is a file...
dan [Thu, 10 Sep 2015 17:23:37 +0000 (17:23 +0000)] 
Modify the fts5 leaf page format to permit faster seek operations. This is a file-format change. Any existing databases can be upgraded by running the fts5 'rebuild' command.

FossilOrigin-Name: 0c0c4ae971e54efc526eed7bd071c90dfadb95ff

9 years agoCreate separate "path" and "root" columns in the json_each() and json_tree()
drh [Thu, 10 Sep 2015 17:20:57 +0000 (17:20 +0000)] 
Create separate "path" and "root" columns in the json_each() and json_tree()
virtual tables.  "Root" is the 2nd parameter and is fixed.
"Path" varies as json_tree() walks the hierarchy.

FossilOrigin-Name: 127cce3eb96b819005832997e0a082df9fb96f0b

9 years agoIncrement the fts5 version value to indicate that the on-disk format has changed. fts5-incompatible
dan [Thu, 10 Sep 2015 16:39:38 +0000 (16:39 +0000)] 
Increment the fts5 version value to indicate that the on-disk format has changed.

FossilOrigin-Name: 99de5e3613d557728dd196353516bc7cf64a0e6c

9 years agoFix a segfault in fts5 that could occur if the database contents were corrupt.
dan [Thu, 10 Sep 2015 16:19:01 +0000 (16:19 +0000)] 
Fix a segfault in fts5 that could occur if the database contents were corrupt.

FossilOrigin-Name: 4931e37da4d2c26d7afc5432f7f0d534b51a85fa

9 years agoMerge latest changes from trunk. Including fts5_expr.c fixes.
dan [Thu, 10 Sep 2015 15:52:42 +0000 (15:52 +0000)] 
Merge latest changes from trunk. Including fts5_expr.c fixes.

FossilOrigin-Name: 716e7e747714d6af502f6a87ca8d789bb7ce162a

9 years agoUpdate description of on-disk format in fts5_index.c.
dan [Thu, 10 Sep 2015 15:49:16 +0000 (15:49 +0000)] 
Update description of on-disk format in fts5_index.c.

FossilOrigin-Name: 85aac7b8b6731e2f6880b80cfd62d431ea059799

9 years agoMake the sqlite3ext.h header file responsive to -DSQLITE_OMIT_LOAD_EXTENSION.
drh [Thu, 10 Sep 2015 15:24:27 +0000 (15:24 +0000)] 
Make the sqlite3ext.h header file responsive to -DSQLITE_OMIT_LOAD_EXTENSION.

FossilOrigin-Name: 47a46a9fa4a96cdb96a20b6aec802661b1ee4598

9 years agoDisable tests for json_each() and json_tree() on builds where
drh [Thu, 10 Sep 2015 15:22:35 +0000 (15:22 +0000)] 
Disable tests for json_each() and json_tree() on builds where
virtual tables are not supported

FossilOrigin-Name: bb8ee3b140a0a8b7c89f5debf22369f204ceef0b

9 years agoFix the --help option on test/releasetest.tcl. Also fix the final error
drh [Thu, 10 Sep 2015 15:20:49 +0000 (15:20 +0000)] 
Fix the --help option on test/releasetest.tcl.  Also fix the final error
count so that it includes a count of subtest crashes.

FossilOrigin-Name: 9ecf684dfe0cd7e3b058d208aca7eb600bf1d21b

9 years agoRevert an accidentally committed makefile change.
dan [Thu, 10 Sep 2015 10:40:00 +0000 (10:40 +0000)] 
Revert an accidentally committed makefile change.

FossilOrigin-Name: 402704b13f1f246c0224f90862bed93a825575f1

9 years agoFix an fts5 problem that could occur if a term and the first associated rowid are...
dan [Thu, 10 Sep 2015 10:01:30 +0000 (10:01 +0000)] 
Fix an fts5 problem that could occur if a term and the first associated rowid are on different leaf pages.

FossilOrigin-Name: ffe2796ac9244c62325fce4960f26c653321623c

9 years agoChange the array of 16-bit offsets at the end of each page to an array of varints.
dan [Thu, 10 Sep 2015 05:40:17 +0000 (05:40 +0000)] 
Change the array of 16-bit offsets at the end of each page to an array of varints.

FossilOrigin-Name: fab245bea4f283714c17bca22428d5eb4db5935a

9 years agoAttempt to declare sqlite3MemoryBarrier() correctly for all possible
drh [Thu, 10 Sep 2015 04:17:06 +0000 (04:17 +0000)] 
Attempt to declare sqlite3MemoryBarrier() correctly for all possible
build configurations.

FossilOrigin-Name: da8a288f8ef4be34281519b4b4db9b857b9d168b

9 years agoFix the json_tree() scan for the case when a path is supplied. Add new
drh [Thu, 10 Sep 2015 03:29:11 +0000 (03:29 +0000)] 
Fix the json_tree() scan for the case when a path is supplied.  Add new
json1 test cases.

FossilOrigin-Name: 6adc7de76acee6cfb5ff761739e7a8de7b5bf4b2

9 years agoNo-op the sqlite3_memory_alarm() interface in a different way, that does
drh [Thu, 10 Sep 2015 01:22:09 +0000 (01:22 +0000)] 
No-op the sqlite3_memory_alarm() interface in a different way, that does
not break legacy memory behavior.  This is a re-do of
check-in [5d3f5df4da9f40d5].

FossilOrigin-Name: 8250e2a487ee12c9a2dea5603ab60aed51e5dc7b

9 years agoFix harmless compiler warning in FTS5.
mistachkin [Wed, 9 Sep 2015 23:54:46 +0000 (23:54 +0000)] 
Fix harmless compiler warning in FTS5.

FossilOrigin-Name: 86146a731d75eb25279c0e072c0bdda593de905d

9 years agoFix an assert() enabled by SQLITE_ENABLE_EXPENSIVE_ASSERT in wal.c.
dan [Wed, 9 Sep 2015 19:44:33 +0000 (19:44 +0000)] 
Fix an assert() enabled by SQLITE_ENABLE_EXPENSIVE_ASSERT in wal.c.

FossilOrigin-Name: 8d2ed150a7a15626965cf994ef48c3ab61eca6ec

9 years agoFix a possible NULL pointer deref when using SQLITE_ENABLE_MEMORY_MANAGEMENT.
drh [Wed, 9 Sep 2015 19:27:10 +0000 (19:27 +0000)] 
Fix a possible NULL pointer deref when using SQLITE_ENABLE_MEMORY_MANAGEMENT.

FossilOrigin-Name: 89bfdbfe943adce8e02c84ede014fcfed504c5d3

9 years agoFix harmless compiler warning.
mistachkin [Wed, 9 Sep 2015 17:23:48 +0000 (17:23 +0000)] 
Fix harmless compiler warning.

FossilOrigin-Name: 280fd3a482978b4a488a8b425721e451c2a30745

9 years agoFix harmless compiler warnings in FTS5.
mistachkin [Wed, 9 Sep 2015 17:17:22 +0000 (17:17 +0000)] 
Fix harmless compiler warnings in FTS5.

FossilOrigin-Name: 2cdb18778f20baa902e54f218ba26d2bacf0801e

9 years agoWhen running a CREATE TABLE AS, make the initial temporary sqlite_master entry
drh [Wed, 9 Sep 2015 13:28:06 +0000 (13:28 +0000)] 
When running a CREATE TABLE AS, make the initial temporary sqlite_master entry
for the new table a real record rather than a NULL, in case the query after
the AS actually tries to read the sqlite_master table.
Fix for ticket [acd12990885d9276].

FossilOrigin-Name: 4a18d8bd4cc66eb08c6198cdf6e14f1bce0ec05a

9 years agoFix a bug in preprocessor macros within fts5_main.c.
dan [Wed, 9 Sep 2015 08:15:06 +0000 (08:15 +0000)] 
Fix a bug in preprocessor macros within fts5_main.c.

FossilOrigin-Name: 0eb2b9521fad6fa36e6fa374c2bc1f70b5180f7c

9 years agoRemove an unused local variable from Lemon.
drh [Tue, 8 Sep 2015 21:16:46 +0000 (21:16 +0000)] 
Remove an unused local variable from Lemon.

FossilOrigin-Name: fe9ffe5eed7d376f3f08c78c1ce5514c886f3479

9 years agoEnhance the DBSTAT virtual table with a new hidden table "schema" that if
drh [Tue, 8 Sep 2015 21:12:53 +0000 (21:12 +0000)] 
Enhance the DBSTAT virtual table with a new hidden table "schema" that if
set will cause the table to report on the specified schema rather than on
"main".  Also:  Fix a faulty assert in sqlite3_context_db_handle().

FossilOrigin-Name: 6beb512c7a3c3649b56f0df1ca77855535a87ba7

9 years agoEponymous virtual tables exist in the "main" schema only. Enforce this rule.
drh [Tue, 8 Sep 2015 20:26:09 +0000 (20:26 +0000)] 
Eponymous virtual tables exist in the "main" schema only.  Enforce this rule.

FossilOrigin-Name: 06f90bb274c4bb0c30585024c8d365d43c4162f2

9 years agoRemove the 0x00 terminators from the end of doclists stored on disk.
dan [Tue, 8 Sep 2015 19:55:26 +0000 (19:55 +0000)] 
Remove the 0x00 terminators from the end of doclists stored on disk.

FossilOrigin-Name: 00d990061dec3661b0376bd167082942d5563bfe

9 years agoFix the help message that sqlite3_analyzer.exe generates for invalid
drh [Tue, 8 Sep 2015 17:31:30 +0000 (17:31 +0000)] 
Fix the help message that sqlite3_analyzer.exe generates for invalid
arguments.

FossilOrigin-Name: 33a14e7be1004abca7a30f675459138d7f8d72b1

9 years agoMinor tweaks to Lemon.
drh [Mon, 7 Sep 2015 23:40:42 +0000 (23:40 +0000)] 
Minor tweaks to Lemon.

FossilOrigin-Name: 986677224a8da5e79fbbd90673f1b595da89c5d6

9 years agoEnhance the Lemon parser generator to add SHIFTREDUCE states that reduce the
drh [Mon, 7 Sep 2015 20:11:30 +0000 (20:11 +0000)] 
Enhance the Lemon parser generator to add SHIFTREDUCE states that reduce the
sizes of some of the parser tables.

FossilOrigin-Name: 99b992fa840707711d99f8d05b62412f7008cd93

9 years agoFix an unreachable branch in the new parse automaton. lemon-update
drh [Mon, 7 Sep 2015 20:02:39 +0000 (20:02 +0000)] 
Fix an unreachable branch in the new parse automaton.

FossilOrigin-Name: e9d604b4306a86faae315ac3cba59bf07d1b665c