/ Check-in [b1601db7]
Login

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

Overview
Comment:Make sure the column name flags are restored correctly after an error inside of sqlite3ResultSetOfSelect().
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: b1601db7adba2dccd4f90fbbe5099c801a2b0d97af087fbe82ed98d05496b38c
User & Date: drh 2019-01-24 15:51:03
Context
2019-01-24
16:07
Omit deprecated PRAGMAs when compiling with the -DSQLITE_OMIT_DEPRECATED option. check-in: 008112bc user: drh tags: trunk
15:51
Make sure the column name flags are restored correctly after an error inside of sqlite3ResultSetOfSelect(). check-in: b1601db7 user: drh tags: trunk
15:16
Fix a potential problem with "INSERT INTO ... SELECT * FROM" (or VACUUM) statements on a corrupted database. check-in: db4b4c2c user: dan tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/select.c.

  2085   2085     sqlite3 *db = pParse->db;
  2086   2086     u64 savedFlags;
  2087   2087   
  2088   2088     savedFlags = db->flags;
  2089   2089     db->flags &= ~(u64)SQLITE_FullColNames;
  2090   2090     db->flags |= SQLITE_ShortColNames;
  2091   2091     sqlite3SelectPrep(pParse, pSelect, 0);
         2092  +  db->flags = savedFlags;
  2092   2093     if( pParse->nErr ) return 0;
  2093   2094     while( pSelect->pPrior ) pSelect = pSelect->pPrior;
  2094         -  db->flags = savedFlags;
  2095   2095     pTab = sqlite3DbMallocZero(db, sizeof(Table) );
  2096   2096     if( pTab==0 ){
  2097   2097       return 0;
  2098   2098     }
  2099   2099     /* The sqlite3ResultSetOfSelect() is only used n contexts where lookaside
  2100   2100     ** is disabled */
  2101   2101     assert( db->lookaside.bDisable );