diff options
| author | drh <drh@noemail.net> | 2013-03-24 22:56:49 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2013-03-24 22:56:49 +0000 |
| commit | dba0cb23514248d15da8870951ce5c60e5d478a6 (patch) | |
| tree | 886de3eb8540a974ca13dfeca2c3105da9157dd7 /src/test_config.c | |
| parent | 48864df97d4a09bb229b0a298bb458db31524432 (diff) | |
| download | sqlite-dba0cb23514248d15da8870951ce5c60e5d478a6.tar.gz sqlite-dba0cb23514248d15da8870951ce5c60e5d478a6.zip | |
Remove the SQLITE_OMIT_MERGE_SORT compile-time option and its related code.
The merge sorter is now a required component.
FossilOrigin-Name: 8b44d6fb159e85267095e846cded2764c3bcb895
Diffstat (limited to 'src/test_config.c')
| -rw-r--r-- | src/test_config.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/test_config.c b/src/test_config.c index f79b455a5..f3c2f6116 100644 --- a/src/test_config.c +++ b/src/test_config.c @@ -395,11 +395,7 @@ Tcl_SetVar2(interp, "sqlite_options", "long_double", Tcl_SetVar2(interp, "sqlite_options", "memorymanage", "0", TCL_GLOBAL_ONLY); #endif -#ifdef SQLITE_OMIT_MERGE_SORT - Tcl_SetVar2(interp, "sqlite_options", "mergesort", "0", TCL_GLOBAL_ONLY); -#else - Tcl_SetVar2(interp, "sqlite_options", "mergesort", "1", TCL_GLOBAL_ONLY); -#endif +Tcl_SetVar2(interp, "sqlite_options", "mergesort", "1", TCL_GLOBAL_ONLY); #ifdef SQLITE_OMIT_OR_OPTIMIZATION Tcl_SetVar2(interp, "sqlite_options", "or_opt", "0", TCL_GLOBAL_ONLY); |