diff options
| author | dan <dan@noemail.net> | 2012-12-05 14:37:55 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2012-12-05 14:37:55 +0000 |
| commit | 9ccaefb172900780bf2449aa26b3c61b12e9550f (patch) | |
| tree | 8025bf5f6d6a7bc57600b35ebc125009b6211e82 | |
| parent | 7f5febc7290dcd5080073590c5f15857768ac336 (diff) | |
| download | sqlite-9ccaefb172900780bf2449aa26b3c61b12e9550f.tar.gz sqlite-9ccaefb172900780bf2449aa26b3c61b12e9550f.zip | |
Fixes to a test case in shared_err.test. The fix is to prevent sqlite3_prepare() from being called when the test intends to test the response of sqlite3_step() to an OOM condition.
FossilOrigin-Name: 40c143955ebe75f8e73119f9103f36a3c8ac4514
| -rw-r--r-- | manifest | 14 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | test/shared_err.test | 5 |
3 files changed, 11 insertions, 10 deletions
@@ -1,5 +1,5 @@ -C Make\ssure\smemory\sis\sfreed\susing\sa\sroutine\sthat\sis\scompatible\swith\sthe\nroutine\sused\sto\sallocate\sthe\smemory.\s\sThe\sSQLITE_MEMDEBUG\scompile-time\noption\senforces\sthis. -D 2012-12-05T14:31:13.890 +C Fixes\sto\sa\stest\scase\sin\sshared_err.test.\sThe\sfix\sis\sto\sprevent\ssqlite3_prepare()\sfrom\sbeing\scalled\swhen\sthe\stest\sintends\sto\stest\sthe\sresponse\sof\ssqlite3_step()\sto\san\sOOM\scondition. +D 2012-12-05T14:37:55.972 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 82c41c0ed4cc94dd3cc7d498575b84c57c2c2384 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -706,7 +706,7 @@ F test/shared6.test 866bb4982c45ce216c61ded5e8fde4e7e2f3ffa9 F test/shared7.test 960760bc8d03e1419e70dea69cf41db62853616e F test/shared8.test b27befbefbe7f4517f1d6b7ff8f64a41ec74165d F test/shared9.test 614a3ca431adc73c857632deb4eff75bcaee40ec -F test/shared_err.test 91e26ec4f3fbe07951967955585137e2f18993de +F test/shared_err.test 0079c05c97d88cfa03989b7c20a8b266983087aa F test/sharedlock.test ffa0a3c4ac192145b310f1254f8afca4d553eabf F test/shell1.test b7896eb84028f3bc8300caf1fc796a73728aad0b F test/shell2.test 037d6ad16e873354195d30bb2dc4b5321788154a @@ -1025,7 +1025,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac -P bdceca2738eb3e8acc44d0384cf2a3a969ee8170 -R 80503ae4ab80fdd798bfbc400d2c3f61 -U drh -Z 4593af5fed4b145d5a6fe4d8f35510ce +P 9f6c68856b694373b7ffb124abd996e519ba5921 +R 0d9643e028363737d4ff9c9748568eab +U dan +Z bbb987d6c204716231a7c44af62004e5 diff --git a/manifest.uuid b/manifest.uuid index 586da8641..97719f291 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9f6c68856b694373b7ffb124abd996e519ba5921
\ No newline at end of file +40c143955ebe75f8e73119f9103f36a3c8ac4514
\ No newline at end of file diff --git a/test/shared_err.test b/test/shared_err.test index f501fc70d..17add94bb 100644 --- a/test/shared_err.test +++ b/test/shared_err.test @@ -401,6 +401,8 @@ do_malloc_test shared_err-8 -tclprep { execsql {INSERT INTO t1 VALUES($a, $b)} db2 } execsql {COMMIT} db2 + execsql BEGIN + execsql ROLLBACK set ::DB2 [sqlite3_connection_pointer db2] set ::STMT [sqlite3_prepare $::DB2 "SELECT a FROM t1 ORDER BY a" -1 DUMMY] sqlite3_step $::STMT ;# Cursor points at 0000000000 @@ -409,8 +411,7 @@ do_malloc_test shared_err-8 -tclprep { execsql { BEGIN; INSERT INTO t1 VALUES(6, NULL); - ROLLBACK; - } + ROLLBACK} } -cleanup { # UPDATE: As of [5668], if the rollback fails SQLITE_CORRUPT is returned. # So these tests have been updated to expect SQLITE_CORRUPT and its |