1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-06 15:49:35 +03:00

The build works again with -DSQLITE_OMIT_MERGE_SORT. The merge-sorter now

avoids spilling to disk (letting the in-memory linked list grow without
bound) if PRAGMA temp_store=3.

FossilOrigin-Name: 68e26c4487696d194ee85370380e4b0e56d206ee
This commit is contained in:
drh
2011-09-03 00:17:51 +00:00
parent 34163c6831
commit ca892a7252
7 changed files with 70 additions and 64 deletions

View File

@@ -372,14 +372,6 @@
# define SQLITE_TEMP_STORE 1
#endif
/*
** If all temporary storage is in-memory, then omit the external merge-sort
** logic since it is superfluous.
*/
#if SQLITE_TEMP_STORE==3 && !defined(SQLITE_OMIT_MERGE_SORT)
# define SQLITE_OMIT_MERGE_SORT
#endif
/*
** GCC does not define the offsetof() macro so we'll have to do it
** ourselves.