83b25d32d7
Merge the pre-3.8.6 changes into the threads branch.
...
FossilOrigin-Name: a608fd1d52606a009c3acc7f1d184b86a7df3c82
2014-08-14 14:02:48 +00:00
d0738004ca
Merge the trunk changes for 3.8.6 beta3 into the sessions branch.
...
FossilOrigin-Name: d49455d9a972fc2224d9beb97165a998ca56e838
2014-08-13 14:43:32 +00:00
81e069eee5
Improve the comments associated with SQLITE_TEST_REALLOC_STRESS and add
...
an extra assert() to prove an assumption.
FossilOrigin-Name: 35c454616321d480ecbc4efdf6869bbcdf0d3aa2
2014-08-12 14:29:20 +00:00
76ccd89d13
If SQLITE_TEST_REALLOC_STRESS is defined, extend the op-code array used by virtual-machine programs by one element at a time, instead of doubling its size with each realloc().
...
FossilOrigin-Name: 4c291827224b84487a38e7ccba2edabc0f15b5ba
2014-08-12 13:38:52 +00:00
3c19bbea0a
The SQLITE_IOERR_BLOCKED extended error code is not longer used, so remove
...
assert() statements and documentation for that error code. Also make other
documentation improvements.
FossilOrigin-Name: 36b7c5cefcad6bad044806092593c84876fee8bc
2014-08-08 15:38:11 +00:00
aae73527ad
Merge recent trunk changes, and especially the fix for the R-Tree problem
...
described in ticket [d2889096e7bdeac6].
FossilOrigin-Name: 8f1beeade0ddf802900c9d203a4fd678d1190394
2014-07-29 12:40:45 +00:00
966d9f267f
Merge recent trunk changes into the threads branch.
...
FossilOrigin-Name: 163c247bd8280ab14fe577329c631c8bd884707f
2014-07-28 15:01:37 +00:00
eac5bd7870
Try to fix harmless compiler warnings reported by Fortify.
...
FossilOrigin-Name: e0fa6fdc14ac5458f9200cbae124f8025ea534ea
2014-07-25 21:35:39 +00:00
2bd2c29a95
Merge all recent trunk changes into the threads branch.
...
FossilOrigin-Name: 770685892c8f09b9cddb2fbb2877cfb291e19425
2014-07-24 16:54:28 +00:00
35c3d8cc75
Merge recent trunk changes into the sessions branch.
...
FossilOrigin-Name: a9db017eabdefafcda87c497e8bafa07002ac0fe
2014-07-24 16:23:51 +00:00
a7ab6d8165
Allow the SQLITE_MAX_ATTACHED compile-time option to be larger than 62. The
...
default limit on the number of attached databases remains 10.
FossilOrigin-Name: 1a817ae2f35fa0396148dda2782cd4f919bf5c6f
2014-07-21 15:44:39 +00:00
857745c089
Update the sqlite3_stmt_busy() function so that it correctly returns true for "ROLLBACK" statements that have been stepped but not yet reset.
...
FossilOrigin-Name: 61cee3c0678f5abd9131a29ab946a5e71f55643e
2014-07-19 17:57:10 +00:00
6614181610
Merge the latest trunk changes into the threads branch.
...
FossilOrigin-Name: ae23a65eb1547fbe8b86ab71477071990a22d31d
2014-06-30 20:25:03 +00:00
f257b4c613
Merge the latest trunk enhancements into the sessions branch.
...
FossilOrigin-Name: a5d94eaba6aa12ff16d2a0af2fc752bcdb461877
2014-06-30 20:02:55 +00:00
6696ba3eab
Add an OOM fault injection test for the new code on this branch.
...
FossilOrigin-Name: c96de490ac77dd23c108004b95152cce4922fe27
2014-06-28 19:06:49 +00:00
84de690b4f
Do not run the vdbeRecordCompareDebug() assert if pKeyInfo->db is NULL since
...
in that case there would be no way to check for a memory allocation failure.
FossilOrigin-Name: 63ed2d6acb82be8a74dbf6a61388be6da6113985
2014-05-02 18:46:52 +00:00
2ae56f50ce
Merge orderby-planning with this branch.
...
FossilOrigin-Name: d9549de31741239ece060e448b592ce8fc5b8042
2014-05-02 18:05:38 +00:00
79211e194d
Simplify assert() statements used to verify correct operation of
...
record comparison routines.
FossilOrigin-Name: 3300d62dcbe74842cf86ca436959fe4e77a89f84
2014-05-02 17:33:16 +00:00
a7bf23c6b5
Fix some broken asserts in btree.c and vdbeaux.c that may fail following an OOM error.
...
FossilOrigin-Name: e15f47064bef431c0afd8bf93eb4e160c23ad562
2014-05-02 17:12:41 +00:00
e9af1894e3
Merge recent trunk changes into the threads branch.
...
FossilOrigin-Name: 8729aa3e3ed1da2e15408ef8705cbe185cd2a5ac
2014-04-18 12:38:54 +00:00
a1a483d54e
Merge recent trunk changes into sessions.
...
FossilOrigin-Name: 95e77efe076ab421bd246119c47dba5dacf9d087
2014-04-18 01:10:05 +00:00
d249090450
Remove the unused second argument from sqlite3ExprCachePop(). Add an
...
ALWAYS() on an always-true conditional in sqlite3VdbeResolveLabel().
FossilOrigin-Name: ab23abf392175d3e256ff619b13abbbe732a49ed
2014-04-13 19:28:15 +00:00
652cc4b6dc
Merge all recent changes from trunk,
...
including the fix for the OP_SCopy-vs-OP_Copy problem.
FossilOrigin-Name: 9515c8344a6743bbb0c6a6e49fb79fb3139090df
2014-04-03 16:35:33 +00:00
38fdead890
Fix a problem with OOM handling in the sorter code.
...
FossilOrigin-Name: 59cd5229e2b5be5272cf57c7e7d09e97d16a5425
2014-04-01 10:19:02 +00:00
a1f7c0a21c
Enhance the sqlite3VdbeRecordCompare() routines so that if they encounter
...
database corruption, they will set the UnpackedRecord.isCorrupt field and
return 0. The sqlite3BtreeMovetoUnpacked() routine detects this and returns
SQLITE_CORRUPT, causing the corruption to be reported back to the top-level.
FossilOrigin-Name: 7fa85eaaaf6d211378620d728a759fdfe30a15b0
2014-03-28 03:12:48 +00:00
24ed9d0445
Merge in fixes (including the corrupt-database crash fix) and
...
performance enhancements from trunk.
FossilOrigin-Name: fc8ca1a87e7127bd28f32fd809aec3e24355fbfa
2014-03-26 19:43:30 +00:00
182ea4e324
Earlier detection of corruption in sqlite3VdbeRecordCompare() in order to
...
avoid a potential buffer overread.
FossilOrigin-Name: 28ddecff044dbc2dff50a7d8406ab67dfe06587f
2014-03-26 14:51:07 +00:00
e2ac506704
Add an assert() and a comment to clarify the operation of the
...
vdbeRecordCompareInt() routine.
FossilOrigin-Name: 851abdb8fd9b5a8a6ce21db53d30dbac3c430cc7
2014-03-26 12:02:38 +00:00
86dd3716b9
Detect when a VdbeCursor is still pointing at a valid row but that row has
...
moved, and invalidated the return from prior sqlite3BtreeDataFetch() or
sqlite3BtreeKeyFetch() calls.
FossilOrigin-Name: e6798871ce94961135762669af418cd78540c121
2014-03-25 11:00:21 +00:00
079a307259
First attempt at getting block-sort to work. This is an incremental check-in.
...
There are many problems still to be worked out.
FossilOrigin-Name: 59742dd4c5259883850044d0938248b009ebd045
2014-03-19 14:10:55 +00:00
f2eded23f5
Merge the latest 3.8.4 tweaks from trunk.
...
FossilOrigin-Name: 1ed463d91866182fbc884fb88770717ee5bf33ce
2014-03-06 13:48:31 +00:00
b6e8fd105c
Fix some incorrect comments and typos in comments. Add testcase() macros
...
to some of the new record comparison code.
FossilOrigin-Name: b83cfe899d84fe9d61540e9984321ca30401638c
2014-03-06 01:56:33 +00:00
0503cf491f
Merge in various obscure bug fixes and the removal of Mem.memType from trunk.
...
FossilOrigin-Name: 0828975d580d309a1c66da4b6caeb65b21a01199
2014-03-05 14:49:51 +00:00
afc14f72ef
Experimental simplification of memory flags/type handling.
...
FossilOrigin-Name: bac2820e13a79d91d0f8938c643134a9d6900327
2014-03-05 01:29:18 +00:00
ed79b45cf7
Fix an assert() so that it takes OOM errors into account.
...
FossilOrigin-Name: 53f6ec792f5f62fcdbf25e0fce5545dd1c3048a4
2014-03-04 16:21:18 +00:00
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
ffe6bc2b93
Fix harmless compiler warning.
...
FossilOrigin-Name: 8d18a803bdeab290a6e9ff26911897f5f8683876
2014-03-04 11:16:20 +00:00
f926d1ea47
Fix more instances of assuming 'char' is signed. And, make sure to never shift
...
a signed integer.
FossilOrigin-Name: f10130ede433a19b3945753f23962871c8d2dcf3
2014-03-04 04:04:33 +00:00
13a747e5e4
Fix a couple of harmless compiler warnings.
...
FossilOrigin-Name: fcf480cc630976b619aabd5f7fb7b09601a178fb
2014-03-03 21:46:55 +00:00
9b8afef260
Avoid a buffer overread in vdbeCompareRecordInt() that might occur if the database is corrupt.
...
FossilOrigin-Name: 7c0b4381f0e6f33cb13299a915851d9431bf3850
2014-03-03 20:48:50 +00:00
5668969a69
Fix a typo in a comment. No changes to code.
...
FossilOrigin-Name: 1f4991ab1676bf85599fc32068ceeddeb05f648c
2014-03-03 19:29:28 +00:00
295aedf097
Fix compiler warnings.
...
FossilOrigin-Name: ba8993727e5752cbc92c7d78437e9e0510c899f7
2014-03-03 18:25:24 +00:00
fcb44a89f2
Fix a harmless compiler warning.
...
FossilOrigin-Name: d7f6837e6997a4d5c0fd2d08b52887d691dd6f97
2014-03-03 15:13:27 +00:00
900defa07a
Merge latest trunk changes.
...
FossilOrigin-Name: e00ed717fbe456010ec6c746490d7c3e9d94ec5a
2014-03-03 14:45:06 +00:00
3833e934d3
Remove the vdbeRecordCompareLargeHeader function. Fix some other details.
...
FossilOrigin-Name: 3861e853105cb8da344c7eebd2e455622b26395e
2014-03-01 19:44:56 +00:00
c91b2fd310
Change the MEM_Dyn flag so that it means that Mem.xDel exists and must be
...
used to free the string or blob. Add tighter invariant checks on Mem.
FossilOrigin-Name: 44e1c33767cae3bf2cbd2238831fe67197009b43
2014-03-01 18:13:23 +00:00
75fd054201
Factor the Mem invariant checker into a separate procedure (rather than a
...
macro) so that it can be more easily extended.
FossilOrigin-Name: 354699d50e7d251504a7b3d6fbec9e5bcf99557f
2014-03-01 16:24:44 +00:00
defbd9dade
Add extra assert() statements trying to catch a Mem object in an inconsistent
...
state.
FossilOrigin-Name: 4aeb3ae435c78070232fef21a147fde4e1c5cd31
2014-03-01 14:45:18 +00:00
597515d70c
Update some test cases that deal with corrupt databases.
...
FossilOrigin-Name: 3a09f5605ac7c6e503eb10acfdc607010414d917
2014-02-28 18:39:51 +00:00
063d4a041a
Minor tweak to vdbeRecordCompareInt().
...
FossilOrigin-Name: 284bde0ee20261737446eb8f5b6b36ad9bc3f355
2014-02-28 09:48:30 +00:00
drh