Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix an assert() that may fail following an OOM error. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
5f592359d6d41708da3b3ac9d987a163 |
| User & Date: | dan 2015-01-21 17:00:57 |
Context
|
2015-01-22
| ||
| 11:29 | Change the undocumented ".selecttrace" command in the shell to accept an integer bitmask rather than a boolean. (check-in: bd63bf88 user: drh tags: trunk) | |
|
2015-01-21
| ||
| 17:20 | Merge trunk changes with this branch. (check-in: f8699a1a user: dan tags: fts5) | |
| 17:00 | Fix an assert() that may fail following an OOM error. (check-in: 5f592359 user: dan tags: trunk) | |
| 00:51 | Fix harmless compiler warning seen with MSVC. (check-in: 78c2e62b user: mistachkin tags: trunk) | |
Changes
Changes to src/expr.c.
2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 |
*/
void sqlite3ExprCacheStore(Parse *pParse, int iTab, int iCol, int iReg){
int i;
int minLru;
int idxLru;
struct yColCache *p;
assert( iReg>0 ); /* Register numbers are always positive */
assert( iCol>=-1 && iCol<32768 ); /* Finite column numbers */
/* The SQLITE_ColumnCache flag disables the column cache. This is used
** for testing only - to verify that SQLite always gets the same answer
** with and without the column cache.
*/
if( OptimizationDisabled(pParse->db, SQLITE_ColumnCache) ) return;
|
| > |
2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 |
*/
void sqlite3ExprCacheStore(Parse *pParse, int iTab, int iCol, int iReg){
int i;
int minLru;
int idxLru;
struct yColCache *p;
/* Unless an error has occurred, register numbers are always positive. */
assert( iReg>0 || pParse->nErr || pParse->db->mallocFailed );
assert( iCol>=-1 && iCol<32768 ); /* Finite column numbers */
/* The SQLITE_ColumnCache flag disables the column cache. This is used
** for testing only - to verify that SQLite always gets the same answer
** with and without the column cache.
*/
if( OptimizationDisabled(pParse->db, SQLITE_ColumnCache) ) return;
|
Changes to test/mallocK.test.
129 130 131 132 133 134 135 136 137 138 |
do_faultsim_test 6 -faults oom* -body {
db cache flush
db eval { SELECT DISTINCT c FROM t3 WHERE b BETWEEN '.xx..' AND '.xxxx' }
} -test {
faultsim_test_result {0 {12 13 14 15}}
}
finish_test
|
> > > > > > > > > > |
129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 |
do_faultsim_test 6 -faults oom* -body {
db cache flush
db eval { SELECT DISTINCT c FROM t3 WHERE b BETWEEN '.xx..' AND '.xxxx' }
} -test {
faultsim_test_result {0 {12 13 14 15}}
}
do_execsql_test 7.1 {
CREATE TABLE x1(a INTEGER PRIMARY KEY, b);
}
do_faultsim_test 7.2 -faults oom* -body {
execsql { SELECT * FROM x1 WHERE a = (SELECT 1) }
} -test {
faultsim_test_result [list 0 {}]
}
finish_test
|