159e6b304c
Merge printf() width and precision overflow fixes from trunk.
...
FossilOrigin-Name: aeca95ac77f6f320a916f7e3c5a7a588ef4a20c8
2015-04-07 23:10:44 +00:00
b6f47deb0c
Avoid signed integer overflow when converting oversized in-line integer
...
widths and precisions in printf().
FossilOrigin-Name: 8e4ac2ce24415926247961b00a62425ae85d6ffb
2015-04-07 15:39:29 +00:00
8c069147ce
Another change to avoid a problem caused by integer overflow in the printf() code.
...
FossilOrigin-Name: 95625ef3adc3c408d67e70f877f390445fbb8292
2015-04-07 14:38:57 +00:00
a30d22a7a6
Further changes to guard against integer overflow in the width and precision
...
of printf() arguments.
FossilOrigin-Name: 5ce4e7d7651e5c72a59f03f7aeb366291e62ab57
2015-04-07 13:28:41 +00:00
74b42275ec
Guard against excessive width and precision in floating-point conversions
...
in the printf routines.
FossilOrigin-Name: c494171f77dc2e5e04cb6d865e688448f04e5920
2015-04-07 12:41:17 +00:00
af76530fb0
Merge obscure problem fixes from trunk.
...
FossilOrigin-Name: 271c110bcf5bf2ea7e113dd01dec876a08e3c047
2015-04-06 12:08:24 +00:00
b33c50f215
Fix a problem with resolving ORDER BY clauses that feature COLLATE clauses attached to compound SELECT statements.
...
FossilOrigin-Name: 427b50fba7362e5b447e79d39050f25ed2ef10af
2015-04-04 16:43:16 +00:00
62ca61ee61
Disable the SQLITE_FCNTL_WAL_BLOCK feature for now. It needs more work and
...
is not yet ready for release.
FossilOrigin-Name: 4ae9a3acc4eeeb7998769eb856c97c2233476f72
2015-04-03 20:33:33 +00:00
edb3e433ba
Merge recent enhancements from trunk.
...
FossilOrigin-Name: aea439bdc6d4d3a8568423171abf381843188826
2015-04-01 16:39:06 +00:00
ccf46d0b90
Improved detection and suppression of endless loops in clearDatabasePage().
...
FossilOrigin-Name: 30011ad2f55cfcacaf23a58ebcc17b17a7b9355e
2015-04-01 13:21:33 +00:00
f9d02f3663
On windows, flush the mapping view when syncing content to disk.
...
FossilOrigin-Name: a828e73dc1ae50189bdf73f60caeb7308738ad7a
2015-03-31 19:40:05 +00:00
8237f6d180
Change the sqlite3_log() message generated on a retry after delay in os_win
...
to be an SQLITE_NOTICE instead of SQLITE_IOERR.
FossilOrigin-Name: 5d533eee049e63b3700f5ef7c28c588afccde57a
2015-03-31 17:32:06 +00:00
6b5f0ebe97
Handle very large URI pathnames for in-memory shared-cache databases.
...
FossilOrigin-Name: 586a94e85bc13700a2093734711c1367fa814b8c
2015-03-31 16:33:08 +00:00
bc8a6b31b6
Ensure that comparison operators do not mess up the MEM_Dyn flag on registers
...
when reverting affinity changes.
FossilOrigin-Name: 02e3c88fbf6abdcf3975fb0fb71972b0ab30da30
2015-03-31 11:42:23 +00:00
2a07f5ecec
Merge all recent trunk enhancements and fixes into the sessions branch.
...
FossilOrigin-Name: df94e61f93da390cb75c48975c50e9d62096ea0b
2015-03-31 00:10:21 +00:00
116f0be024
Prevent a possible infinite loop when trying to DROP a table from
...
a corrupt database.
FossilOrigin-Name: 395bb3e677a6551b06ba96fc58c393132b93d1e8
2015-03-30 23:43:56 +00:00
30d1dcabf5
Merge updates from trunk.
...
FossilOrigin-Name: 45acf6a85150839d591316418dad59ae20ce3aa4
2015-03-27 18:22:01 +00:00
ad1e55e55a
Enhancements to OSTRACE usage in the Win32 VFS.
...
FossilOrigin-Name: ab5800291e1908b5b51d912feeacf748dc9be14b
2015-03-27 18:20:25 +00:00
6f5a37a464
Fix the ".testctrl imposter" command in the command-line shell to be
...
consistent in error reporting and results with the other .testctrl
commands.
FossilOrigin-Name: 0ec08ba8a0fa188146b071a489908332693ba59a
2015-03-27 02:27:20 +00:00
9871a933c1
Using MSVC, get the sqlite3IoTrace variable working with the USE_STDCALL and/or DYNAMIC_SHELL options.
...
FossilOrigin-Name: fe976c9130f6eecfa0a10347ee3f800f32051b89
2015-03-27 00:21:52 +00:00
ccb43714da
When syncing a memory mapped file on Windows, flush the mapped view as well.
...
FossilOrigin-Name: df204049b9ec8dd3e43ed7dc251eaecedc05af4b
2015-03-26 23:36:35 +00:00
592f0cb15e
Avoid leaving the malloc subsystem in a partially initialized state if
...
the low-level initialization callback fails.
FossilOrigin-Name: 3e872011ff5e27738c282f46d2b5803d94fe4b76
2015-03-26 17:04:23 +00:00
21aa6a1acb
Provide source code line numbers for errors in the Windows VFS generated
...
by the winLogIoerr() routine.
FossilOrigin-Name: b5da0d93cd1a3c0917399af3775a32327b883c8e
2015-03-26 15:27:32 +00:00
606a357288
Change an unreachable branch into an assert().
...
FossilOrigin-Name: fb076b28c36975ff2e41440f22fe5de115c195da
2015-03-25 18:29:10 +00:00
d2f83139f3
Fix the saveCursorPosition() routine in btree.c so that it works
...
correctly for a eState=CURSOR_SKIPNEXT cursor.
FossilOrigin-Name: 37866b4d483296ab9b7fcb9f5486695d4c2b8ddd
2015-03-25 17:35:01 +00:00
cbd3349ab9
Reactivate an older assert() (adding an "|| CORRUPT_DB" term) and add a
...
new assert() in btree.c.
FossilOrigin-Name: 1e96520ac1d12ca83f019a60482efa0a074f2f94
2015-03-25 13:06:54 +00:00
f94c9485ef
Add two new assert()s to the sqlite3BtreeDataSize() method.
...
FossilOrigin-Name: 42d1793d6516e285a8925bbfd96b3d3375603d15
2015-03-25 12:05:49 +00:00
790fa6ec30
Further simplifications to the amalgamation builder.
...
FossilOrigin-Name: e826cd7db6b3ab010533d81a759794c2470343d2
2015-03-24 21:54:42 +00:00
59b9b02c1f
Add SQLITE_STDCALL and SQLITE_CDECL macros on public function definitions.
...
FossilOrigin-Name: 242f09d4d1c92ee9058857a5e780442f4b7bad55
2015-03-24 21:27:27 +00:00
edea911945
Merge all recent trunk enhancements into the sessions branch.
...
FossilOrigin-Name: 54aaa6f29ad1bf84148c2403eed77e8311f68d66
2015-03-24 19:02:13 +00:00
4756404847
Suppress a compiler warning that was appearing with SQLITE_THREADSAFE=0.
...
FossilOrigin-Name: 436314b5728c9413f9ac2d837e1c19364f31be72
2015-03-24 18:19:39 +00:00
466fd815fb
Simplify the EXPLAIN output of virtual table P4 parameters to only show the
...
pointer to the sqlite3_vtab object and omit the sqlite3_module object.
FossilOrigin-Name: 85610bbbc60cb4a6ec856123447fdb2ba948e52f
2015-03-24 14:57:02 +00:00
f496a7dc81
More defenses against virtual table being deleted out from under a running
...
statement.
FossilOrigin-Name: 116c99823022c017946b6088878a2d46759deb6e
2015-03-24 14:05:50 +00:00
a68d628291
Prevent a virtual table from being destroyed while it is in use.
...
FossilOrigin-Name: fba674c083286dabb37fed9357b67593b56ed3a5
2015-03-24 13:32:53 +00:00
086723a4a8
Replace the Vdbe.inVtabMethod field with the sqlite3.nVDestroy counter.
...
FossilOrigin-Name: 9faefb96272967e731e83ef516a8c1e1b876391b
2015-03-24 12:51:52 +00:00
ada3f2b14f
Disable loadable extensions in the command-line shell on VxWorks user-space.
...
FossilOrigin-Name: 0ee2d38deb35aefc55395e86984a9a773caf6218
2015-03-23 21:32:50 +00:00
d741129e2b
Track total memory usage using a 64-bit integer on 64-bit systems. Add
...
the sqlite3_status64() interface. Make the sqlite3_status() and
sqlite3_status64() interfaces atomic using mutexes and verify correct
mutex operation using assert() statements.
FossilOrigin-Name: 6fc4e79a2350295a15ac464593ad39d904953041
2015-03-23 19:55:21 +00:00
2493870d9c
Fix a non-C89 variable declaration that causes problems for MSVC.
...
FossilOrigin-Name: 3de085eab2fbe491f2242b340851e8af8f61ad13
2015-03-23 19:16:30 +00:00
062cf27d00
Fix datetype size asserts in btree.c.
...
FossilOrigin-Name: ff4812d0e8e6322ca8b6992925fd4ef4aee463e6
2015-03-23 19:03:51 +00:00
2b4905c81f
Add the SQLITE_PTRSIZE macro. Use it to help sqlite3_status() run faster
...
on 32-bit systems.
FossilOrigin-Name: c742bd6047bc6d0319a5a8c31d97f6b9229507f6
2015-03-23 18:52:56 +00:00
af89fe66ea
Add the sqlite3_status64() interface. Make the new interface and the legacy
...
sqlite3_status() both atomic and threadsafe. Check threadsafety using
assert()s.
FossilOrigin-Name: 1ce8e8fa4b866aafa12b1da0eb4d02321af9293e
2015-03-23 17:25:18 +00:00
74893a4cdb
Fix a potential NULL pointer dereference following a syntax error.
...
FossilOrigin-Name: 8d27e3e16a9be79fe227e833f4770ebe09a9d90b
2015-03-22 10:23:17 +00:00
d425864d33
Fix harmless compiler warnings with MSVC when assert() and SQLITE_MEMDEBUG are both enabled.
...
FossilOrigin-Name: 9513dbd4860c8dd391f831982d09aff227d16f5c
2015-03-21 23:38:59 +00:00
5ac936529c
Do not invoke a C preprocessor macro with an empty argument, as (reportedly)
...
some versions of GCC are unable to deal with that.
FossilOrigin-Name: de9da317d4df3efefe9a1a48f954af8a19e7d098
2015-03-21 20:59:43 +00:00
c435cf75a5
Fix the blocking WAL lock so that it works and so that it compiles on a Mac.
...
FossilOrigin-Name: 67d69d21de32816894be53e4b446656d4174eb0d
2015-03-21 16:36:03 +00:00
474640638d
Remove an unreachable branch from the OP_VCreate opcode.
...
FossilOrigin-Name: 5fca41a3811766b48f5f23d5d49cc4e6e79fa867
2015-03-21 12:22:16 +00:00
8f9d0b2b25
Correctly detect the error of having a "*" wildcard on a SELECT without
...
a FROM clause on the left-hand side of a recursive CTE.
FossilOrigin-Name: b11d1793a06a44931edcbf12a615b49794d53a62
2015-03-21 03:18:22 +00:00
f063685079
If a column is both UNIQUE and a PRIMARY KEY, make sure the PRIMARY KEY
...
designation takes precedence.
FossilOrigin-Name: d871a7921722bb0fef6d51e1110a9703ddff78c8
2015-03-21 02:58:20 +00:00
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
1fa509afa1
Fix to get SQLITE_SMALL_STACK working correctly again after the previous change.
...
FossilOrigin-Name: 78df0ce13d4f35226f2571bd7de78484ccbee4bb
2015-03-20 16:34:49 +00:00
drh