]>
git.ipfire.org Git - thirdparty/sqlite.git/log
dan [Thu, 19 Nov 2009 15:25:25 +0000 (15:25 +0000)]
Fix some fts3 related issues with the autoconf and amalgamation build systems.
FossilOrigin-Name:
3b17924754343c0163464dabf01a9c46ffccef28
dan [Thu, 19 Nov 2009 14:57:14 +0000 (14:57 +0000)]
drh [Thu, 19 Nov 2009 14:48:40 +0000 (14:48 +0000)]
Fix a bug introduced with recent optimizations: The unary minus operator
is TK_UMINUS, not TK_MINUS.
FossilOrigin-Name:
4bd43307090258f8652c995b056101c51b81274a
dan [Thu, 19 Nov 2009 02:52:57 +0000 (02:52 +0000)]
Merge the fts3-refactor branch with the trunk.
FossilOrigin-Name:
c8d2bd37a4c16154912a0831690584011dc230cb
dan [Thu, 19 Nov 2009 00:15:27 +0000 (00:15 +0000)]
Fix problems introduced into fts3 as part of the refactoring.
FossilOrigin-Name:
fa0998e19d984ee57f4f506c34eb858026cc49c3
drh [Wed, 18 Nov 2009 23:01:25 +0000 (23:01 +0000)]
Performance improvement by avoiding unnecessary calls to memset().
FossilOrigin-Name:
85940468e6f93f7c493fbc129f13cf6233c5d0c0
dan [Wed, 18 Nov 2009 15:35:58 +0000 (15:35 +0000)]
Add some missing comments and fix some other issues in fts3 code.
FossilOrigin-Name:
2fe579e778b75fbf503c02e01e5424c1926f2b49
drh [Wed, 18 Nov 2009 01:25:26 +0000 (01:25 +0000)]
Suppress more instances of unnecessary OP_IsNull and OP_Affinity opcodes.
FossilOrigin-Name:
bf6c0bd1c5568c6292ea0a64c8a5071e1bd3079a
drh [Tue, 17 Nov 2009 23:59:58 +0000 (23:59 +0000)]
Enhancements to the VDBE opcode loop to reduce the number of machine-code
instructions evaluated by about 10%.
FossilOrigin-Name:
9744ffb3f5bc6d8fd59fbb6577a0d549411cd967
drh [Tue, 17 Nov 2009 18:31:47 +0000 (18:31 +0000)]
Code generator tries to avoid pointless OP_IsNull and OP_Affinity opcodes.
FossilOrigin-Name:
ebb0c8a3e977dc741704e733b5a5d931d9b27028
dan [Tue, 17 Nov 2009 12:52:10 +0000 (12:52 +0000)]
Improvements to the way fts3 reads the full-text index.
FossilOrigin-Name:
45c051e78651d8204c17cecdda2bde705698881f
drh [Mon, 16 Nov 2009 23:36:33 +0000 (23:36 +0000)]
Make sure the output of sqlite3OsFullPathname is initialized even if the
fails due to I/O or OOM errors.
FossilOrigin-Name:
e4943adb83819dee06e2e9da25ff6d967ca170de
drh [Mon, 16 Nov 2009 22:54:50 +0000 (22:54 +0000)]
Fix a reference to freed memory that can occur following an OOM error in
where.c.
FossilOrigin-Name:
929b6047391411c6f539e47afe6b63d16e352ccb
drh [Mon, 16 Nov 2009 21:28:45 +0000 (21:28 +0000)]
Back out part of the change in [
23ea2b700fd6d28d ] since TH3 reveals some
problems in OOM situations.
FossilOrigin-Name:
15d215d62df72c1bf1e605629692ee40d96546a6
dan [Mon, 16 Nov 2009 16:36:23 +0000 (16:36 +0000)]
Add a few extra coverage test cases for fts3.
FossilOrigin-Name:
f29c8fcade4aadeae3824975cf59f306c11c906b
drh [Mon, 16 Nov 2009 15:11:51 +0000 (15:11 +0000)]
Use the sqlite3CtypeMap[] to improve the speed and reduce the size of the
logic in the tokenizer that recognizes identifiers.
FossilOrigin-Name:
1c9243b0760741f48b15efb0da661255177aed8b
drh [Mon, 16 Nov 2009 03:13:40 +0000 (03:13 +0000)]
Additional optimizations in sqlite3VdbeRecordCompare().
FossilOrigin-Name:
23ea2b700fd6d28d3b13663d164faba3760c572e
drh [Mon, 16 Nov 2009 02:14:00 +0000 (02:14 +0000)]
Optimizations to the sqlite3VdbeRecordCompare() routine help it to run 12.5%
faster for some traces.
FossilOrigin-Name:
74c76f0bf946d184275de478ec72220d76342493
dan [Sat, 14 Nov 2009 23:50:11 +0000 (23:50 +0000)]
Fixes to fts3 integrity check code.
FossilOrigin-Name:
d3cae986ee1a176b1b015c3cebcd58ff0c3bdf92
drh [Sat, 14 Nov 2009 23:22:23 +0000 (23:22 +0000)]
Optimizations to the main loop inside sqlite3VdbeExec() to help VDBE byte code
run a few percent faster.
FossilOrigin-Name:
d622ac6ac7a297754494d3a33dbaeea02836272e
drh [Sat, 14 Nov 2009 18:04:35 +0000 (18:04 +0000)]
Make the sqlite3VdbeExec() function about 2% faster by storing the opcode
array in a local variable.
FossilOrigin-Name:
8bd3cc82720ac7e8a9d4a03a882b6f8226867b0d
dan [Sat, 14 Nov 2009 11:41:00 +0000 (11:41 +0000)]
Further OOM testing for fts3 code. Add Tcl code implementing an integrity-check for fts3.
FossilOrigin-Name:
c27d46b33e8596b45c562c2742b05030e8899092
drh [Fri, 13 Nov 2009 20:52:43 +0000 (20:52 +0000)]
Performance improvements and size reductions on the OP_Seek* family of
VDBE opcodes.
FossilOrigin-Name:
ed820f45cf4354b1e1db64049c47a07221a7ff6d
drh [Fri, 13 Nov 2009 19:43:43 +0000 (19:43 +0000)]
Simplify the OPFLG processing logic in the VDBE for a speed boost in the
VDBE processing loop and a reduction in code size.
FossilOrigin-Name:
3352b3eba545c3128efb7665ec91d4df3b16011d
drh [Fri, 13 Nov 2009 17:05:53 +0000 (17:05 +0000)]
Force 8-byte memory alignment on memory allocated for VDBE cursors.
FossilOrigin-Name:
bdc45ba77fb77771c8ff46b8d6c2dd29e6d3b019
drh [Fri, 13 Nov 2009 15:03:59 +0000 (15:03 +0000)]
Changes to test_intarray.c so that it build with SQLITE_OMIT_VIRTUALTABLE.
Added testcase() macros to expr.c.
FossilOrigin-Name:
f0599d28fabe9e67a7150a91c266cb7655a2002e
dan [Fri, 13 Nov 2009 10:36:20 +0000 (10:36 +0000)]
Start reworking fts3 code to match the rest of SQLite (code conventions, malloc-failure handling etc.).
FossilOrigin-Name:
30a92f1132801c7582007ee625c577ea2ac31cdf
drh [Thu, 12 Nov 2009 20:39:03 +0000 (20:39 +0000)]
Shift more OP_Found opcodes over to using the unpacked format, for improved
performance.
FossilOrigin-Name:
6705ab1ad12cbdbbcf1f3e5439a4e6cbdcc421b3
drh [Thu, 12 Nov 2009 19:59:44 +0000 (19:59 +0000)]
Enhance the OP_Found and OP_NotFound opcodes so that they can accept an
array of registers as an unpacked record in addition to a record built
using OP_MakeRecord. Use this to avoid OP_MakeRecord calls during IN
expression processing.
FossilOrigin-Name:
b9eab885cd2ca1a1633329e7036c125e8dba62c5
drh [Thu, 12 Nov 2009 17:52:24 +0000 (17:52 +0000)]
Factor out the IN operator code generation into a subroutine. Use this
subroutine to implement both logic and branching versions of the IN operator.
FossilOrigin-Name:
fcff5b7e2d059ffb8d21df57d0c9648bd876e813
drh [Thu, 12 Nov 2009 13:32:22 +0000 (13:32 +0000)]
Factor out the code generator for BETWEEN into a subroutine.
FossilOrigin-Name:
5735f60b23460e7677b9c982a26bc13b0f4ed02b
shaneh [Thu, 12 Nov 2009 05:04:50 +0000 (05:04 +0000)]
Update comment for substrFunc(). Added additional SUBSTR() test cases.
FossilOrigin-Name:
d7b3801dc7fad1b002f892fb5d82047ebff98369
drh [Thu, 12 Nov 2009 04:26:39 +0000 (04:26 +0000)]
Suppress unnecessary OP_Noop instructions on when the right table of a
LEFT JOIN uses the index-only optimization.
FossilOrigin-Name:
e8aec08bee1c8d593474561898037aed571e64ce
drh [Thu, 12 Nov 2009 03:46:34 +0000 (03:46 +0000)]
Suppress excess OP_Null opcodes caused by binary IS or IS NOT operators
that are converted into unary ISNULL or NOTNULL operators.
FossilOrigin-Name:
cff1b36ab2c417611f59e96694005c03762788d2
drh [Thu, 12 Nov 2009 03:13:26 +0000 (03:13 +0000)]
Adjustments to the implementation of LIMIT so that it uses fewer opcodes.
FossilOrigin-Name:
39d5b292d27faf00ab58ff4074f91f7aea97cd99
drh [Wed, 11 Nov 2009 23:58:06 +0000 (23:58 +0000)]
If the sector size is unspecified (initially 0) then set it to 512, not to 32.
FossilOrigin-Name:
8861b5c16031ad570ffbe17b3ec8163b136a7f63
drh [Wed, 11 Nov 2009 23:48:22 +0000 (23:48 +0000)]
Remove an obsolete (and incorrect) comment from sqlite3MemCompare().
No changes to code.
FossilOrigin-Name:
c15b70b3aefc399dae1df5bb721530f0e2b7887a
drh [Wed, 11 Nov 2009 20:53:31 +0000 (20:53 +0000)]
Tweaks to the SUBSTR() function to make it dramatically faster in the common
case where the input string is large but the 2nd and 3rd arguments are small
positive integers.
FossilOrigin-Name:
5a474a867c5988ad5ec03719516fdd38f0da5c2c
drh [Wed, 11 Nov 2009 13:17:08 +0000 (13:17 +0000)]
Allow media sector sizes as small as 32. The former minimum size was 512.
FossilOrigin-Name:
5a32bfc17ed022c85d2615c34b41a3dcae2594bd
shaneh [Wed, 11 Nov 2009 04:17:07 +0000 (04:17 +0000)]
Modified CLI to raise an error when extra command line options are passed.
Added tests to verify correct handling, as well as other basic handling
of command line options. Ticket [
f5cb008a65 ].
FossilOrigin-Name:
09b4f19f100fe82a8321b9ded99e679b7eedc1fa
drh [Wed, 11 Nov 2009 01:14:17 +0000 (01:14 +0000)]
Additional test cases for the coalesce() and ifnull() functions.
FossilOrigin-Name:
d0591258b62df4fa610b7ac2a2af0344cf82f231
drh [Wed, 11 Nov 2009 00:24:31 +0000 (00:24 +0000)]
Generate VDBE code for the built-in COALESCE() and IFNULL() functions. This
allows unused arguments to never be evaluated, which is a performance win when
the unused argument is a subquery.
FossilOrigin-Name:
30055b257c3c65f8123cad5ac6c62c4c6ca2c900
drh [Tue, 10 Nov 2009 17:55:47 +0000 (17:55 +0000)]
Additional intarray test cases and tweaks to comments.
FossilOrigin-Name:
0c8db5d88ee41dab58d6464283b51f82f7457838
drh [Tue, 10 Nov 2009 17:24:37 +0000 (17:24 +0000)]
Initial implementation and test cases for the "intarray" virtual table.
FossilOrigin-Name:
0e7d29253f093d4125ede3cfc478e4bf09aef987
shaneh [Tue, 10 Nov 2009 17:07:30 +0000 (17:07 +0000)]
Fix for datbase name being ignored with the -batch option in the CLI. Ticket [
aeff892c57 ].
FossilOrigin-Name:
8097c64acfc74c913bc6d7d631bc1423c90df93f
drh [Tue, 10 Nov 2009 01:30:52 +0000 (01:30 +0000)]
Remove the obsolete "$Id:$" RCS identifier strings from the source code.
FossilOrigin-Name:
f6c045f649036958078cb15cd9d5453680c82b0c
drh [Tue, 10 Nov 2009 01:13:25 +0000 (01:13 +0000)]
Remove from the TCL interface some old code associated with sqlite3_analyzer.
FossilOrigin-Name:
01f2271e51751ff66061f65556a5e324f243756a
drh [Tue, 10 Nov 2009 01:12:50 +0000 (01:12 +0000)]
Omit some code that is not used when SQLITE_SECURE_DELETE is defined.
FossilOrigin-Name:
5a9e746357aa8edeef6b89f01e19cd57555bef32
shaneh [Fri, 6 Nov 2009 17:20:17 +0000 (17:20 +0000)]
Improved shell "dot" command argument handling. Ticket [
f12a9eeedc ].
FossilOrigin-Name:
9fb699193378bf812ef97889adc0b1a98ad56d5b
drh [Fri, 6 Nov 2009 04:13:18 +0000 (04:13 +0000)]
Fix the backup API so that a backup from an empty database to a non-empty
database works. Ticket [
0bf974bdf9 ]. The only changes are in assert()
statements.
FossilOrigin-Name:
ddb71cd9ed395804a13dc136bb7688a7627c798f
shaneh [Fri, 6 Nov 2009 03:33:01 +0000 (03:33 +0000)]
Merged accidental fork.
FossilOrigin-Name:
d410cd4e42ecf50a849f49cf3395ec169350e7cf
shaneh [Fri, 6 Nov 2009 03:22:54 +0000 (03:22 +0000)]
Add some very basic tests for the commands available from the CLI.
FossilOrigin-Name:
6bf43338049f956b447139c90df472682e28222a
drh [Thu, 5 Nov 2009 18:46:02 +0000 (18:46 +0000)]
Recover an ophaned branch that resulted from some ill-advised "shunning".
This check-in should be identical to [
bd443f39a9 ] except that it should
be on the trunk.
FossilOrigin-Name:
38eaf1ab6e05161e6dc7cd69e942aeca16548c45
drh [Wed, 4 Nov 2009 13:30:01 +0000 (13:30 +0000)]
Remove "const" from parameter of sqlite3BtreeFactory() to avoid a compiler
warning.
FossilOrigin-Name:
eb7a544fe49d1626bacecfe53ddc03fe082e3243
drh [Wed, 4 Nov 2009 13:17:14 +0000 (13:17 +0000)]
Create a new datatype "ynVar" to hold "nVar" (number of variable) values.
This is normally 16-bits can can be 32-bits if SQLITE_MAX_VARIABLE_NUMBER
is large enough.
FossilOrigin-Name:
24a4d520d540d92b611abc4eb57dc6da9be4eac6
drh [Wed, 4 Nov 2009 01:56:27 +0000 (01:56 +0000)]
Report errors back up to the ATTACH command if the codec fails to initialize.
FossilOrigin-Name:
a6c696102eb483080b0a1d31b85f6b5f85c3efbf
shane [Tue, 3 Nov 2009 19:42:30 +0000 (19:42 +0000)]
Fix compiler warnings on MSVC build.
FossilOrigin-Name:
01c4b5b84ec7ce589e20ea66e80011f092ab32f0
drh [Tue, 3 Nov 2009 19:18:31 +0000 (19:18 +0000)]
Enhancements to lemon to generate more compact action tables and to avoid
making array bounds tests that can never fail on action table calculations.
FossilOrigin-Name:
27d8e684db4651155c4bcb8bb44bf1c692b8c48b
drh [Tue, 3 Nov 2009 13:08:16 +0000 (13:08 +0000)]
Force all qsort() calls in mkkeywordhash.c to be stable so that we get
predictable results on different platforms.
FossilOrigin-Name:
3b02df27ab63936226a90098d88535ed19c2b782
drh [Tue, 3 Nov 2009 13:02:25 +0000 (13:02 +0000)]
Adjust the lemon implementation so that it always computes the same PDA
regardless of qsort() implementation on the host platform. In other words,
make all sorts in lemon stable.
FossilOrigin-Name:
d66a0f31ebcc56e6f0f462b3db6aab54f7fab816
drh [Tue, 3 Nov 2009 01:22:07 +0000 (01:22 +0000)]
All SQLITE_MAX_VARIABLE_NUMBER to exceed 32767. The sizes of some structures
increase when the compile-time parameter is configured this way.
FossilOrigin-Name:
16a24b4485420bdf30d3c8e22cfbaf008e07df02
drh [Mon, 2 Nov 2009 18:44:58 +0000 (18:44 +0000)]
Bug fix in the recent changes to mkopcodeh.awk.
FossilOrigin-Name:
6610cac435428434bc978d5e4df92aa1e431240b
drh [Mon, 2 Nov 2009 18:14:50 +0000 (18:14 +0000)]
Update the generator AWK script for opcodes.h so that it always generates
opcode numbers in the same order and is not dependent on the hash order
of opcode names within AWK.
FossilOrigin-Name:
e730195f52429dc1bc4c1559880effd68e3eced9
drh [Mon, 2 Nov 2009 18:01:50 +0000 (18:01 +0000)]
Do not insert the date and time of generation into the amalgamation.
FossilOrigin-Name:
9f6cf13dfbe6f1fe0c05a9c5df557ae20dc08cbd
drh [Mon, 2 Nov 2009 17:40:07 +0000 (17:40 +0000)]
Update the configure script for version 3.6.20.
FossilOrigin-Name:
f19cb105d929f0a56f9597b6eb33ad96d0f7eddc
drh [Mon, 2 Nov 2009 15:51:52 +0000 (15:51 +0000)]
Comment changes in support of better documentation. No changes to code.
FossilOrigin-Name:
79ab4714e408d01103b277c234b10db50a50352a
drh [Sun, 1 Nov 2009 19:26:59 +0000 (19:26 +0000)]
Fix compiler warnings. Better comments on some variables associated with
LIKE/GLOB processing in the query planner.
FossilOrigin-Name:
cfa2db0ff7a94e7f66c35f672ee41cadd45a6dd7
drh [Fri, 30 Oct 2009 14:27:14 +0000 (14:27 +0000)]
Increase the version number to 3.6.20.
FossilOrigin-Name:
612952743da28e651512547fc0d3925f4c698eb4
drh [Fri, 30 Oct 2009 13:25:56 +0000 (13:25 +0000)]
Avoid storing the result register for EXISTS and SELECT in any field of
the Expr object - simply return the register number as the return value
of the function that codes those expressions.
FossilOrigin-Name:
7253f8fad1efe6b88666f0f8740d247ff07a7640
drh [Thu, 29 Oct 2009 13:48:10 +0000 (13:48 +0000)]
Reduce the memory required by prepared statements that use the IN operator
with a list on the right and an INTEGER PRIMARY KEY on the left.
FossilOrigin-Name:
e7984ad2f7e4be30e7198ebd6609a7f6177513e2
drh [Tue, 27 Oct 2009 18:06:10 +0000 (18:06 +0000)]
Minor updates and corrections to comments in btreeInt.h. No changes to code.
FossilOrigin-Name:
ad949fa1acb4546fe4f2a448025579cc374dd8dd
drh [Mon, 26 Oct 2009 22:32:55 +0000 (22:32 +0000)]
Remove additional obsolete code from the sqlite3_release_memory() logic.
FossilOrigin-Name:
2eeb6ed818dac240afe761b4e7c11e961255bf33
drh [Mon, 26 Oct 2009 22:08:21 +0000 (22:08 +0000)]
Remove some obsolete code within #if 0 that was causing developer concern.
FossilOrigin-Name:
1d64e9453fb59d2bb1b5cb0cbacaf135b8f928c3
drh [Sat, 24 Oct 2009 15:51:33 +0000 (15:51 +0000)]
Fix a compiler warning that occurs when building the TCL interface.
FossilOrigin-Name:
fc36034bdc3b21e91f24be812e103da26f5d7d5d
drh [Sat, 24 Oct 2009 03:04:10 +0000 (03:04 +0000)]
Another attempt at getting the pTail pointer computations correct for
sqlite3_prepare16(). Ticket [
3fe897352e ].
FossilOrigin-Name:
a96b4e8c01d167d35b9ec08ee6603e52ead601b6
shane [Sat, 24 Oct 2009 02:06:14 +0000 (02:06 +0000)]
In shell, modified to not print informational messages during startup while in "batch mode".
Ticket [
2cb66577f6 ].
FossilOrigin-Name:
e3898e25cf0ea870612eeaca6af2396f0eab0e07
shane [Sat, 24 Oct 2009 02:00:07 +0000 (02:00 +0000)]
In shell, changed ".tables" command to not add '%' to specified pattern. This is consistent
with other commands that take a LIKE pattern (.dump, .schema, .indices).
Updated internal help to better describe LIKE pattern usage.
Fixed a few more inconsistencies in error messages. Ticket [
6da68f691b ].
FossilOrigin-Name:
7201244e67c197f16d6752cc0fa7232a9664381e
drh [Sat, 24 Oct 2009 01:55:14 +0000 (01:55 +0000)]
Check-in [
19064d7cea ] broke the pTail return on sqlite3_prepare16() when
the SQL contained surrogates. This check-in restores correct function.
Part of ticket [
3fe897352e ].
FossilOrigin-Name:
65b1e3a4c31f6cb6fd3f600701658b0cdbee603f
drh [Fri, 23 Oct 2009 18:15:46 +0000 (18:15 +0000)]
Make sure that UTF16 to UTF8 conversions to not read past the end of the
UTF16 input buffer if the last two bytes of the UTF16 happen to be the
first half of a surrogate pair. Ticket [
3fe897352e ]
FossilOrigin-Name:
19064d7cea838e1a93fe63743ed247f440679e97
shane [Fri, 23 Oct 2009 01:27:39 +0000 (01:27 +0000)]
In shell, ensure that do_meta_command() returns consistent error values.
Adjusted the text of some error message to be more consistent.
Ticket [
beb2dd69ad ].
FossilOrigin-Name:
1ebac9edddd28bdbbd9815fdb64eb9129f39f94a
shane [Fri, 23 Oct 2009 00:37:15 +0000 (00:37 +0000)]
In shell, modified "import" handling to ensure error code returned correctly on exit.
Ticket [
bd770b2c52 ].
FossilOrigin-Name:
009efad0f4293dd08a6f2f16d8eb9e94e2f962ca
shane [Thu, 22 Oct 2009 21:23:35 +0000 (21:23 +0000)]
In shell, reworked .header and .echo handling.
Updated shell_exec() to (really) handle multiple statements.
Tickets [
72adc99de9 ], [
7b61b6c6ce ], and [
eb620916be ].
FossilOrigin-Name:
790402c150e2026cd0c147a4cadbe9b9ab97b688
drh [Thu, 22 Oct 2009 20:52:05 +0000 (20:52 +0000)]
Merge the MD5 checksum logic into the TCL interface. This facilitates building
a tclsh that contains both SQLite and MD5. The plan is to use this
augmented tclsh to help build the documentation.
FossilOrigin-Name:
a024c0a85b6f2288c455a7192f6ca7a8493b621a
drh [Thu, 22 Oct 2009 20:50:36 +0000 (20:50 +0000)]
Add some sample requirement implementation comments to where.c.
FossilOrigin-Name:
9854ad00aed08793ae7ba3c2cfbab7a2dba4dcb8
shane [Thu, 22 Oct 2009 18:12:58 +0000 (18:12 +0000)]
In shell, in shell_exec() logic, use type info if available when
outputting in "insert" mode for other types in addition to blobs.
Changed shell_exec() to use sqlite_prepare_v2(). Ticket [
72adc99de9 ].
FossilOrigin-Name:
ab99faca6ce57a5e37405dfc8dc55d149cf3f8a3
shane [Thu, 22 Oct 2009 17:30:15 +0000 (17:30 +0000)]
Updated shell to output blobs in X'1234' form when in "insert" mode. Ticket [
72adc99de9 ].
FossilOrigin-Name:
a2ad9e6363308b7137fcb1916769151b96933cdb
drh [Thu, 22 Oct 2009 00:20:17 +0000 (00:20 +0000)]
Add markings on test evidence for R-30323-21917.
FossilOrigin-Name:
e51af74c3aeb82604841cc83a490351d1422e838
drh [Thu, 22 Oct 2009 00:14:05 +0000 (00:14 +0000)]
Mention the sqlite3_column_count() function on the same documentation page
with all of the other sqlite3_column... interfaces.
FossilOrigin-Name:
5354ace55f448d10128e2bfe4b904a1441e3bf10
shane [Wed, 21 Oct 2009 14:33:03 +0000 (14:33 +0000)]
Merge accidental fork back to trunk.
FossilOrigin-Name:
f63397ad6c32f575fe33b2f7dd22380cd1f51f1d
shane [Wed, 21 Oct 2009 14:11:48 +0000 (14:11 +0000)]
Modified shell to call output_html_string() for header values in .mode html.
Updated output_html_string() to support the 5 basic HTML entities (<,>,&,',").
Ticket [
dc3a6e5b31 ].
FossilOrigin-Name:
c8815fcd88d17b2864e689c84eb8a63ef242ff04
shane [Wed, 21 Oct 2009 13:53:58 +0000 (13:53 +0000)]
Made detectSchemaProblem function and aSchemaTable array static. Ticket [
6f8b0c5855 ].
FossilOrigin-Name:
c6f22f3e38018246a2add1a509aa6c5c55b7e0be
drh [Wed, 21 Oct 2009 13:48:24 +0000 (13:48 +0000)]
Add evidence marks to parse.y. Fix a broken evidence link in e_fkey.tcl.
FossilOrigin-Name:
0441d28e84af20e3a98a07a43471784ac09c78db
shane [Wed, 21 Oct 2009 03:56:54 +0000 (03:56 +0000)]
For the shell, changed the output of the errors on lines 2910 and 2914 to goto
stderr. I left the timer values going to stdout as all of the other interactive
shell commands (startup banner, help, etc.) go to stdout and I felt this was more
consistent. Ticket
43db771bb2 .
FossilOrigin-Name:
8a8eeb0c5af4bbeafd9864b03557eb9cd32f09ce
shane [Wed, 21 Oct 2009 03:42:58 +0000 (03:42 +0000)]
For Windows version of shell, add support for .timer command
using the GetProcessTimes() API if available (in the same way
getrusage() is used on UNIX.) Ticket
89668ca167 .
FossilOrigin-Name:
83216fbe904425f5b15d1ae689cea9d13670e979
shane [Wed, 21 Oct 2009 02:00:47 +0000 (02:00 +0000)]
For Windows VFS, modified xGetLastError() to call FormatMessage()
with the FORMAT_MESSAGE_IGNORE_INSERTS option. Additionally updated
to ensure strings are returned as UTF8. Ticket
39c85e8a4e .
FossilOrigin-Name:
761396f8cb79be34853ba698a65af54874c3c10e
drh [Tue, 20 Oct 2009 15:27:55 +0000 (15:27 +0000)]
Clarify the use of sqlite3_shutdown().
Ticket [
f9af981dd2a2 ].
Comment changes only - no changes to code.
FossilOrigin-Name:
b2aa48b52f140ad722001de686c5b2f802e9babd
drh [Tue, 20 Oct 2009 15:01:58 +0000 (15:01 +0000)]
Fix the VACUUM command so that when the MAIN and TEMP databases have
identically named tables, content from the TEMP database does not
accidently overwrite MAIN database content.
Ticket [
d82e3f3721296e905d7e8c9dee718f71a826b0eb ].
Note that this bug could potentially lead to database corruption.
FossilOrigin-Name:
0bbd8d72ec66cbe11c2548a04ad478202b2b69b6
drh [Tue, 20 Oct 2009 14:23:09 +0000 (14:23 +0000)]
Remove all mention of sqlite3_next_stmt() from the documentation of
sqlite3_close().
FossilOrigin-Name:
f494ed38a8d3fabb7a064ba4a860d5288c5a571b
drh [Tue, 20 Oct 2009 14:08:41 +0000 (14:08 +0000)]
Update documentation on the sqlite3_prepare_v2() interface. No changes to code.
FossilOrigin-Name:
3b00e769cd30aa50a75f82babb7d2cc90aeb1238
dan [Tue, 20 Oct 2009 07:01:24 +0000 (07:01 +0000)]
Fix cases where modifying bound variables using the clear_bindings() or transfer_bindings() APIs can invalidate a query plan.
FossilOrigin-Name:
e6808c988c9cd7b2db23f18b5fe2177151b6f586