database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00
Code Activity

Merge the latest trunk changes into the sessions branch.

Browse Source 
FossilOrigin-Name: f3d148e0d10e16cd744ec88a2961fd617368c5ed
This commit is contained in:
drh
2011-06-21 01:29:16 +00:00
parent 467eb01caa 3c22c60434
commit 34ffcfff02
32 changed files with 373 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/test_config.c
View File

@@ -231,11 +231,7 @@ static void set_options(Tcl_Interp *interp){
Tcl_SetVar2(interp, "sqlite_options", "compound", "1", TCL_GLOBAL_ONLY);
#endif
#ifdef SQLITE_OMIT_CONFLICT_CLAUSE
Tcl_SetVar2(interp, "sqlite_options", "conflict", "0", TCL_GLOBAL_ONLY);
#else
Tcl_SetVar2(interp, "sqlite_options", "conflict", "1", TCL_GLOBAL_ONLY);
#endif
#if SQLITE_OS_UNIX
Tcl_SetVar2(interp, "sqlite_options", "crashtest", "1", TCL_GLOBAL_ONLY);