/ Check-in [ebadb7dc25]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Merge accidental fork.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: ebadb7dc25b9ab544a941ceb9a18926268c21bb60de98737f6ef19915ee8e61a
User & Date: mistachkin 2018-09-06 16:50:54
Context
2018-09-06
17:23
Fix test script problems causing SQLITE_OMIT_VIRTUALTABLE builds to fail. check-in: 37ad064e5f user: dan tags: trunk
16:50
Merge accidental fork. check-in: ebadb7dc25 user: mistachkin tags: trunk
16:47
Fix harmless compiler warning. check-in: 88b39c46c1 user: mistachkin tags: trunk
16:47
Fix a problem causing SQLITE_OMIT_VIRTUALTABLE builds to fail. check-in: 18beabc848 user: dan tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/sqliteInt.h.

  3087   3087     ** first field in the recursive region.
  3088   3088     ************************************************************************/
  3089   3089   
  3090   3090     Token sLastToken;       /* The last token parsed */
  3091   3091     ynVar nVar;               /* Number of '?' variables seen in the SQL so far */
  3092   3092     u8 iPkSortOrder;          /* ASC or DESC for INTEGER PRIMARY KEY */
  3093   3093     u8 explain;               /* True if the EXPLAIN flag is found on the query */
  3094         -#if !defined(SQLITE_OMIT_VIRTUALTABLE) && !defined(SQLITE_OMIT_ALTERTABLE)
         3094  +#if !(defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_OMIT_ALTERTABLE))
  3095   3095     u8 eParseMode;            /* PARSE_MODE_XXX constant */
  3096   3096   #endif
  3097   3097   #ifndef SQLITE_OMIT_VIRTUALTABLE
  3098   3098     int nVtabLock;            /* Number of virtual tables to lock */
  3099   3099   #endif
  3100   3100     int nHeight;              /* Expression tree height of current sub-select */
  3101   3101   #ifndef SQLITE_OMIT_EXPLAIN