Cherrypick commit [1d5e744cc6] from the trunk in order to avoid leaving a file-ddescr...

FossilOrigin-Name: 86b8481be7e76cccc92d14ce762d21bfb69504af

diff --git a/manifest b/manifest
index 13f51b9b62fa4f7ab6fbb637936de21b32391e9f..648d798026c3539b9749c2c01e8e6fdd03e52b66 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C bad\sassert
-D 2012-04-02T23:42:48.936
+C Cherrypick\scommit\s[1d5e744cc6]\sfrom\sthe\strunk\sin\sorder\sto\savoid\sleaving\sa\sfile-ddescriptor\sopen\sin\stest\sscripts\scapi3.test\sand\scapi3c.test.
+D 2012-04-03T19:43:07.319
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 7bd2fa7753fc9de38994b8d4fa7f10deb19966a5
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -320,9 +320,9 @@ F test/boundary4.test 89e02fa66397b8a325d5eb102b5806f961f8ec4b
 F test/busy.test 76b4887f8b9160ba903c1ac22e8ff406ad6ae2f0
 F test/cache.test f64136b0893c293d0b910ed057b3b711249099a7
 F test/capi2.test 835d4cee9f542ea50fa8d01f3fe6de80b0627360
-F test/capi3.test 468b750927dd6b8ed487232bb8ea93ce03edd605
+F test/capi3.test 8dedb0050610e9ff95cd9d487beb0ce5f33a31ee
 F test/capi3b.test efb2b9cfd127efa84433cd7a2d72ce0454ae0dc4
-F test/capi3c.test 7f45970fb0ae10d04cb957030fef725758a48898
+F test/capi3c.test 01f197d73f4d4d66316483662f475cab7ab5bd60
 F test/capi3d.test 17b57ca28be3e37e14c2ba8f787d292d84b724a1
 F test/capi3e.test f7408dda65c92b9056199fdc180f893015f83dde
 F test/cast.test 4c275cbdc8202d6f9c54a3596701719868ac7dc3
@@ -1004,7 +1004,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P d51c086e5c006821e2ab932f229649a729d914b2
-R 59c782263b21a57e0518ee90df49c70e
-U adam
-Z ad124cf32597d65682c21902b1691c73
+P 0c0150f2a349460d685e63be1a747d2bfbe5c8c4
+R 4a632657509f5ed1cfb05420592ec8ff
+U dan
+Z fcb9e7416b7e86cf09e8dde2e964f1f0

diff --git a/manifest.uuid b/manifest.uuid
index 85fb1b64d407a9ff248653446ad00aed6bb04beb..f79a3ec6b552ce0f9a09dfe027fc844893a4e52c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0c0150f2a349460d685e63be1a747d2bfbe5c8c4
\ No newline at end of file
+86b8481be7e76cccc92d14ce762d21bfb69504af
\ No newline at end of file

diff --git a/test/capi3.test b/test/capi3.test
index 5b2fb390cdcd7b3086b46dafa3705a55933ed24c..d9106267c5feda58589b93208fcdceaacd68636c 100644 (file)
--- a/test/capi3.test
+++ b/test/capi3.test
@@ -901,18 +901,22 @@ do_test capi3-11.9.3 {
 do_test capi3-11.10 {
   sqlite3_step $STMT
 } {SQLITE_ERROR}
-ifcapable {autoreset} {
-  do_test capi3-11.11 {
-    sqlite3_step $STMT
-  } {SQLITE_ROW}
-  do_test capi3-11.12 {
-    sqlite3_step $STMT
-    sqlite3_step $STMT
-  } {SQLITE_DONE}
-  do_test capi3-11.13 {
-    sqlite3_finalize $STMT
-  } {SQLITE_OK}
+ifcapable !autoreset {
+  # If SQLITE_OMIT_AUTORESET is defined, then the statement must be
+  # reset() before it can be passed to step() again.
+  do_test capi3-11.11a { sqlite3_step $STMT } {SQLITE_MISUSE}
+  do_test capi3-11.11b { sqlite3_reset $STMT } {SQLITE_ABORT}
 }
+do_test capi3-11.11 {
+  sqlite3_step $STMT
+} {SQLITE_ROW}
+do_test capi3-11.12 {
+  sqlite3_step $STMT
+  sqlite3_step $STMT
+} {SQLITE_DONE}
+do_test capi3-11.13 {
+  sqlite3_finalize $STMT
+} {SQLITE_OK}
 do_test capi3-11.14 {
   execsql {
     SELECT a FROM t2;

diff --git a/test/capi3c.test b/test/capi3c.test
index b26ca205f0d681037e79cfb6b1f23a3a1a54b86a..40920918947e69d209bac9584b6e0be429a74f85 100644 (file)
--- a/test/capi3c.test
+++ b/test/capi3c.test
@@ -856,18 +856,22 @@ do_test capi3c-11.9.3 {
 do_test capi3c-11.10 {
   sqlite3_step $STMT
 } {SQLITE_ABORT}
-ifcapable {autoreset} {
-  do_test capi3c-11.11 {
-    sqlite3_step $STMT
-  } {SQLITE_ROW}
-  do_test capi3c-11.12 {
-    sqlite3_step $STMT
-    sqlite3_step $STMT
-  } {SQLITE_DONE}
-  do_test capi3c-11.13 {
-    sqlite3_finalize $STMT
-  } {SQLITE_OK}
+ifcapable !autoreset {
+  # If SQLITE_OMIT_AUTORESET is defined, then the statement must be
+  # reset() before it can be passed to step() again.
+  do_test capi3-11.11a { sqlite3_step $STMT } {SQLITE_MISUSE}
+  do_test capi3-11.11b { sqlite3_reset $STMT } {SQLITE_ABORT}
 }
+do_test capi3c-11.11 {
+  sqlite3_step $STMT
+} {SQLITE_ROW}
+do_test capi3c-11.12 {
+  sqlite3_step $STMT
+  sqlite3_step $STMT
+} {SQLITE_DONE}
+do_test capi3c-11.13 {
+  sqlite3_finalize $STMT
+} {SQLITE_OK}
 do_test capi3c-11.14 {
   execsql {
     SELECT a FROM t2;