/ Check-in [86b8481b]
Login

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

Overview
Comment:Cherrypick commit [1d5e744cc6] from the trunk in order to avoid leaving a file-descriptor open in test scripts capi3.test and capi3c.test. This is the version of SQLite that ships by default on the original Mountain Lion release.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | apple-osx | mountain-lion
Files: files | file ages | folders
SHA1: 86b8481be7e76cccc92d14ce762d21bfb69504af
User & Date: dan 2012-04-03 19:43:07
Original Comment: Cherrypick commit [1d5e744cc6] from the trunk in order to avoid leaving a file-ddescriptor open in test scripts capi3.test and capi3c.test.
Context
2012-08-07
01:37
Parser bug fix: Make sure the table constraints allowed by prior releases can still be parsed, even if they are technically not allowed by the syntax diagram. This is a cherry-pick of [a1c014d8a87c8940b3], [38bf90af1ede6ee64e], and [e536ac041815b118c4]. Leaf check-in: 28aed847 user: drh tags: apple-osx-ml
2012-04-19
20:43
Update the apple-osx branch so that it includes all of the latest trunk changes. check-in: b72f07b4 user: drh tags: apple-osx
2012-04-03
19:43
Cherrypick commit [1d5e744cc6] from the trunk in order to avoid leaving a file-descriptor open in test scripts capi3.test and capi3c.test. This is the version of SQLite that ships by default on the original Mountain Lion release. check-in: 86b8481b user: dan tags: apple-osx, mountain-lion
2012-04-02
23:42
bad assert check-in: 0c0150f2 user: adam tags: apple-osx
Changes
Hide Diffs Side-by-Side Diffs Show Whitespace Changes Patch

Changes to test/capi3.test.

   897    897   } {0 {}}
   898    898   do_test capi3-11.9.3 {
   899    899     sqlite3_get_autocommit $DB
   900    900   } 1
   901    901   do_test capi3-11.10 {
   902    902     sqlite3_step $STMT
   903    903   } {SQLITE_ERROR}
   904         -ifcapable {autoreset} {
          904  +ifcapable !autoreset {
          905  +  # If SQLITE_OMIT_AUTORESET is defined, then the statement must be
          906  +  # reset() before it can be passed to step() again.
          907  +  do_test capi3-11.11a { sqlite3_step $STMT } {SQLITE_MISUSE}
          908  +  do_test capi3-11.11b { sqlite3_reset $STMT } {SQLITE_ABORT}
          909  +}
   905    910     do_test capi3-11.11 {
   906    911       sqlite3_step $STMT
   907    912     } {SQLITE_ROW}
   908    913     do_test capi3-11.12 {
   909    914       sqlite3_step $STMT
   910    915       sqlite3_step $STMT
   911    916     } {SQLITE_DONE}
   912    917     do_test capi3-11.13 {
   913    918       sqlite3_finalize $STMT
   914    919     } {SQLITE_OK}
   915         -}
   916    920   do_test capi3-11.14 {
   917    921     execsql {
   918    922       SELECT a FROM t2;
   919    923     }
   920    924   } {1 2}
   921    925   do_test capi3-11.14.1 {
   922    926     sqlite3_get_autocommit $DB

Changes to test/capi3c.test.

   852    852   } {0 {}}
   853    853   do_test capi3c-11.9.3 {
   854    854     sqlite3_get_autocommit $DB
   855    855   } 1
   856    856   do_test capi3c-11.10 {
   857    857     sqlite3_step $STMT
   858    858   } {SQLITE_ABORT}
   859         -ifcapable {autoreset} {
          859  +ifcapable !autoreset {
          860  +  # If SQLITE_OMIT_AUTORESET is defined, then the statement must be
          861  +  # reset() before it can be passed to step() again.
          862  +  do_test capi3-11.11a { sqlite3_step $STMT } {SQLITE_MISUSE}
          863  +  do_test capi3-11.11b { sqlite3_reset $STMT } {SQLITE_ABORT}
          864  +}
   860    865     do_test capi3c-11.11 {
   861    866       sqlite3_step $STMT
   862    867     } {SQLITE_ROW}
   863    868     do_test capi3c-11.12 {
   864    869       sqlite3_step $STMT
   865    870       sqlite3_step $STMT
   866    871     } {SQLITE_DONE}
   867    872     do_test capi3c-11.13 {
   868    873       sqlite3_finalize $STMT
   869    874     } {SQLITE_OK}
   870         -}
   871    875   do_test capi3c-11.14 {
   872    876     execsql {
   873    877       SELECT a FROM t2;
   874    878     }
   875    879   } {1 2}
   876    880   do_test capi3c-11.14.1 {
   877    881     sqlite3_get_autocommit $DB