diff options
| author | drh <drh@noemail.net> | 2013-05-03 18:29:22 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2013-05-03 18:29:22 +0000 |
| commit | ec7ecb8c9a42c68e6152f7e72b2badcbb8671c55 (patch) | |
| tree | e0ff1a0cdbb5bafdea569c861d8913ef63d962fb /src/sqliteInt.h | |
| parent | 16fb176814bd2b8fe46f7ed0e50a0b3d33db89a0 (diff) | |
| parent | bce5beee18befa9b3ee47938e9e4c3e2e572cf3c (diff) | |
| download | sqlite-ec7ecb8c9a42c68e6152f7e72b2badcbb8671c55.tar.gz sqlite-ec7ecb8c9a42c68e6152f7e72b2badcbb8671c55.zip | |
Merge all recent trunk changes into the sessions branch.
FossilOrigin-Name: 3879ab1b532828fcc12a50a95b6730faebcb69e9
Diffstat (limited to 'src/sqliteInt.h')
| -rw-r--r-- | src/sqliteInt.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 7cde2bcaf..611f7a556 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -563,7 +563,7 @@ extern const int sqlite3one; || defined(_WIN32) \ || (defined(__APPLE__) && defined(__MACH__)) \ || defined(__sun) -# define SQLITE_MAX_MMAP_SIZE 2147483648 +# define SQLITE_MAX_MMAP_SIZE 0x7fff0000 /* 2147418112 */ # else # define SQLITE_MAX_MMAP_SIZE 0 # endif @@ -2600,6 +2600,7 @@ struct Walker { int (*xSelectCallback)(Walker*,Select*); /* Callback for SELECTs */ Parse *pParse; /* Parser context. */ int walkerDepth; /* Number of subqueries */ + u8 bSelectDepthFirst; /* Do subqueries first */ union { /* Extra data for callback */ NameContext *pNC; /* Naming context */ int i; /* Integer value */ |