mistachkin
f39eaf29d0
Add WinRT comments to MSVC makefile.
...
FossilOrigin-Name: ddea657bd8fe3762bd460524ac9223f0a5b09752
2012-03-20 02:18:42 +00:00
mistachkin
428bef2e07
Remove version information from the MSVC makefile as it is no longer necessary.
...
FossilOrigin-Name: 6f0c1f9761be0402b82945517fdb3a36aeacbaeb
2012-03-20 02:10:22 +00:00
mistachkin
9917a71da0
Merge updates from trunk.
...
FossilOrigin-Name: 4ab1ffd45d4c25368b9b393a3336068b747d8b22
2012-03-19 23:32:26 +00:00
mistachkin
ca04d8a9f1
Fix typo, use the syscall table for osOutputDebugStringA.
...
FossilOrigin-Name: 9598c2a398a6e7d9c3ee8b2ae32c21538ad3e15a
2012-03-19 23:28:35 +00:00
drh
0299b40f0f
Add additional test cases to e_insert.test. Update evidence marks.
...
no changes to core code.
FossilOrigin-Name: 036395c0a8e08883b11df025e3da9e2461e4b1eb
2012-03-19 17:42:46 +00:00
drh
d13a3bc772
Fix one more compiler warning missed by the previous check-in.
...
FossilOrigin-Name: bc03d99a78e90c02b69037e5f5f81537b5a3ac60
2012-03-19 14:57:49 +00:00
drh
01ea399a84
Suppress harmless compiler warnings on windows in FTS4 and RTREE.
...
FossilOrigin-Name: 4fd68647c8d4b120e04d054617cef31001f44c6f
2012-03-19 14:51:19 +00:00
drh
bbe0520329
Avoid a compiler warning (an incorrect compiler warning, at that) in vs2010.
...
FossilOrigin-Name: 7dd97f12cd268cac1241f0f3e8de94bb629b97c7
2012-03-19 14:28:43 +00:00
dan
0d1614c731
Ensure that compatible malloc and free functions are used with stat3 data if SQLITE_ENABLE_STAT3 is defined.
...
FossilOrigin-Name: 32bb1ecee4e43a4683512dbca047abf735afd313
2012-03-19 10:21:37 +00:00
mistachkin
5593b2e653
On Windows, when no temporary path is available, skip prepending the directory separator.
...
FossilOrigin-Name: 32b5c20e54474fcc33ba937293e97566a555e733
2012-03-18 03:22:44 +00:00
mistachkin
86f89871b0
Add SQLITE_OMIT_SHUTDOWN_DIRECTORIES compile-time option to disable clearing the sqlite3_data_directory and sqlite3_temp_directory variables during sqlite3_shutdown. Also, only clear the variables if the heap was actually shutdown.
...
FossilOrigin-Name: 1ae9f9e4f730eccbc0fc3408de1ac3c4be931e01
2012-03-18 01:32:44 +00:00
dan
d1ab097d45
Fix various incorrect and missing comments and other style issues in and around the FTS incremental merge code.
...
FossilOrigin-Name: 7aabb62c8ccbd2b8d216e25226f06e5820dec38a
2012-03-17 16:56:57 +00:00
dan
db0ad5f204
In pager1.test, use "file attr test.db -readonly 0" before "file attr test.db -perm rw-rw-rw-", not after.
...
FossilOrigin-Name: 4f5283f18f570a09b95c26e5aa14885ada518dd2
2012-03-17 15:12:16 +00:00
dan
a2e85abaa2
Modify a test in ioerr2.test to account for the new SQLITE_ABORT_ROLLBACK extended error code.
...
FossilOrigin-Name: affaebde109e8dd851474ffe7b7d48b1aae8c7ed
2012-03-17 09:43:09 +00:00
drh
1a342a4a73
Update the trace2.test script for languageid.
...
FossilOrigin-Name: a11528ac575fa20fd8022756d042a32fe1272e12
2012-03-16 17:00:49 +00:00
drh
c8d7b24e93
Cherrypick the [3475092cff] fix for 32-bit overflow with large language-ids
...
into trunk.
FossilOrigin-Name: 2755edc7f1186ba8955f2c3550a90f40a55ddae2
2012-03-16 16:52:54 +00:00
dan
81b35dc66c
Fix some integer overflow problems that can occur when using large langauge id values.
...
FossilOrigin-Name: 3475092cff862080a020d386076d739f0d22c9b2
2012-03-16 15:54:19 +00:00
dan
e931b7f45f
Add a comment to the FTS getAbsoluteLevel() function. No actual code changes.
...
FossilOrigin-Name: 7e0f861beda4d74d0c3c9fb4abb3ddb5fee346bd
2012-03-16 14:54:07 +00:00
mistachkin
e4c46aaccd
Reset the sqlite3_data_directory and sqlite3_temp_directory variables when the sqlite3_shutdown function is called since they may refer to memory allocated by the heap subsystem that was just shutdown.
...
FossilOrigin-Name: cd70bc4b788b947d47a7a7158c27028160df06bd
2012-03-16 10:28:40 +00:00
drh
7a48480d07
Fix harmless compiler warnings.
...
FossilOrigin-Name: 74eadeec34c4b19cf5f8b7f648db3b7ad601a00e
2012-03-16 00:28:11 +00:00
drh
a929e6282b
Add the sqlite3_db_readonly() API to trunk.
...
FossilOrigin-Name: fed134a5f395533de0c9d76950697c060ddb126d
2012-03-15 22:54:37 +00:00
drh
421377e67a
Add the sqlite3_db_readonly() interface. This is still tentative, pending
...
a closer look at other ideas to accomplish the same thing.
FossilOrigin-Name: 254f99ea9ff1534948bdb179e69ab0c940c87ec1
2012-03-15 21:28:54 +00:00
dan
4ab6f2b9c1
Modify incremental merge code to merge nMin segments at a time.
...
FossilOrigin-Name: cd34bc1af4ba608ea3b52bab55bcfe0086711900
2012-03-15 17:45:50 +00:00
mistachkin
40c471d921
Add SQLITE_WIN32_HEAP_CREATE compiler define to control whether or not the Win32 native allocator will create an isolated heap for all allocated data.
...
FossilOrigin-Name: 8693fb652ecd1ad0b03e9067839970b321c3f904
2012-03-15 03:40:59 +00:00
mistachkin
16afb9ee96
Fix macro issues for osGetProcessHeap and sqlite3_win32_write_debug.
...
FossilOrigin-Name: d3d071598aba367e3d73001ab38d7a78306875ea
2012-03-14 23:08:59 +00:00
mistachkin
e8c9a184be
Fix typos, use #if instead of #ifdef when checking for the Win32 native heap validation define.
...
FossilOrigin-Name: 845aa46f69784420ada4116078f8dc0a68cf3707
2012-03-14 20:20:37 +00:00
mistachkin
0df898e27d
Avoid redefining macros. Enable use of the Win32 native heap on WinRT. Use the syscall table to call OutputDebugStringW and fix type casting warnings.
...
FossilOrigin-Name: 46c412a8f6470c9e8c4bdeafaf4db435fbb694ab
2012-03-14 20:17:34 +00:00
dan
5730ef599c
Add tests for incremental merge code.
...
FossilOrigin-Name: 570473729d6561d81e6e5f8884fd18487008636e
2012-03-14 20:01:52 +00:00
dan
a2af0aecdb
Avoid allocating a large object on the stack in the incremental merge code. Use sqlite3_malloc() instead.
...
FossilOrigin-Name: 36ae510de45be44efd34cff242d02fb21b7419ac
2012-03-14 12:17:40 +00:00
dan
8af1fc721e
Fix another bug in the incremental merge code.
...
FossilOrigin-Name: f97b12e0955c4c29f9c31a186d72d87f7407782e
2012-03-14 11:51:31 +00:00
mistachkin
25cf4fe988
Remove SQLITE_OS_WINRT setting from MSVC makefile.
...
FossilOrigin-Name: df4caf1326f5aa3ba11345e5e9604d7af4385fe8
2012-03-14 03:41:32 +00:00
mistachkin
184997c9a6
Add warning to the docs about changing the data directory when a database connection is open.
...
FossilOrigin-Name: c07cd85ca9698b48f960b164cab3a38472a17640
2012-03-14 01:28:35 +00:00
mistachkin
a112d140ae
Add experimental support for resolving relative database file paths using a fixed user-defined directory.
...
FossilOrigin-Name: 7354ae8fd3eccee2cf9f6501da5b1a014c31556f
2012-03-14 00:44:01 +00:00
dan
604f58a686
Fix some bugs in the incremental merge code. Some remain.
...
FossilOrigin-Name: bff21683705a61b8b8672e0b44c287d1dc7c32a9
2012-03-13 19:56:34 +00:00
mistachkin
5ff72401c9
Add assert to verify the number of characters to write in sqlite3_win32_write_debug.
...
FossilOrigin-Name: 8083f6164f3308c1c1d4f4d84be1894e382fe2e6
2012-03-13 03:38:22 +00:00
mistachkin
f4f327ce07
Defer creation of the sleep event object until it is needed. Added sqlite3_win32_write_debug and sqlite3_win32_sleep APIs to assist in portability to WinRT.
...
FossilOrigin-Name: 7af88ad306612dd316827c506dbf8df7477b2ec1
2012-03-13 03:35:07 +00:00
mistachkin
5cfbeac070
Cleanup the Windows syscall table, removing the unused CreateFileMapping entry.
...
FossilOrigin-Name: fb7d8bf6ec5c0ef9a948bc14c28770e34f57db1a
2012-03-13 01:30:20 +00:00
mistachkin
df562d5535
More changes required to compile for WinRT using VS 11 beta. Also, replace more APIs with their WinRT alternatives.
...
FossilOrigin-Name: 6b997d9c32076c480ff4f101ff93bae3f443e252
2012-03-13 01:16:57 +00:00
drh
331b67c151
Candidate fix for the optimizer problem described in ticket
...
[b7c8682cc17f3] which can causes a LEFT JOIN to be changed
into a INNER JOIN if there are OR terms in the WHERE clause.
FossilOrigin-Name: 0dc4cb935514131c99172175d57feec3a1743aa9
2012-03-09 22:02:08 +00:00
drh
ab4f6385de
Minor commenting and stylistic changes only.
...
FossilOrigin-Name: a1747086c5e0c152fcf4bd9fa80a61b6f03f4a94
2012-03-09 12:52:43 +00:00
mistachkin
776f5c96f4
Merge test current directory value fix from trunk and fix uri tests.
...
FossilOrigin-Name: 88963c33c19a051280f7f31bdc1b322d6837cf43
2012-03-08 20:39:08 +00:00
mistachkin
533b8f6d47
On Windows, make sure the returned test current directory value does not contain any backslashes.
...
FossilOrigin-Name: efee39e64bd95c284220fdb0ae8ee6c1847fadab
2012-03-08 20:28:31 +00:00
mistachkin
6aa18c95f1
Merge and manually resolve testing updates from trunk.
...
FossilOrigin-Name: 5eecdb44dd809e91002b8ecf59ada72f4b56549a
2012-03-08 20:22:42 +00:00
mistachkin
f8a784645c
On Windows, make sure the current directory value used by the test suite is 'normalized' to what the parent command shell sees. Also, clean the test directories used by the quota2.test file.
...
FossilOrigin-Name: 82bcd7ec1531f6d71c079578434c58d3ce46a1de
2012-03-08 20:00:36 +00:00
dan
593c9824bc
Add the 'merge=?,?' command to fts4. This still needs some work.
...
FossilOrigin-Name: 741b8f897750eac3c9774fd65de7e40bb89781b1
2012-03-08 18:39:03 +00:00
mistachkin
5483f772b1
When compiled for WinRT, use the CreateFile2 and LoadPackagedLibrary functions instead of CreateFile and LoadLibrary.
...
FossilOrigin-Name: 27d6942ca270d6e724ffd230ed58a8683d67dfa4
2012-03-07 20:11:47 +00:00
drh
2938f924cc
If a CHECK constraint is named, report that name on the error message when
...
the constraint fails.
FossilOrigin-Name: 9a0f90d9deb335ac71044b8afa81538d85cc7ccf
2012-03-07 19:13:29 +00:00
drh
4cdb9076d6
Merge in the latest trunk changes.
...
FossilOrigin-Name: ca4708531a5e0debbe3d0999a4d210ef2a347972
2012-03-07 16:52:38 +00:00
mistachkin
4a41f34552
Fix for test issues when there is no current directory support due to being compiled for WinRT.
...
FossilOrigin-Name: a811cb01528beab8afd899411d187d4d960ddcc8
2012-03-06 03:00:49 +00:00
mistachkin
c548465435
Add compile-time define to indicate if the VFS supports the concept of a current directory (as WinCE and WinRT do not). Avoid using the GetTempPath and GetFullPathName APIs on WinRT. Some tests still need adjustments.
...
FossilOrigin-Name: 86c049a171acc3f4a43771f3e7176a90210d7799
2012-03-05 22:52:33 +00:00
