SQLite: Check-in [43e474d3]

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

Overview

Comment:	Correct two test names to make them unique.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| busy-timeout-pragma
Files:	files \| file ages \| folders
SHA1:	43e474d3e9364e6ed417db06e98faa3e5bc2eb26
User & Date:	mistachkin 2012-09-07 20:10:30

Context

2012-09-27
12:11		Merge the "PRAGMA busy_timeout" change into trunk. (check-in: 1a679a1e user: drh tags: trunk)
2012-09-07
20:10		Correct two test names to make them unique. (Closed-Leaf check-in: 43e474d3 user: mistachkin tags: busy-timeout-pragma)
18:49		Have PRAGMA busy_timeout return 0 if the busy handler has been changed or cancelled. (check-in: 7be5bc36 user: drh tags: busy-timeout-pragma)

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to test/lock.test.

   267    267   do_test lock-2.11b {
   268    268     db2 eval {PRAGMA busy_timeout}
   269    269   } {400}
   270    270   do_test lock-2.12 {
   271    271     db2 eval {PRAGMA busy_timeout(0)}
   272    272     execsql COMMIT
   273    273   } {}
   274         -do_test lock-2.11b {
          274  +do_test lock-2.12b {
   275    275     db2 eval {PRAGMA busy_timeout}
   276    276   } {0}
   277         -integrity_check lock-2.12
          277  +integrity_check lock-2.13
   278    278   
   279    279   # Try to start two transactions in a row
   280    280   #
   281    281   do_test lock-3.1 {
   282    282     execsql {BEGIN TRANSACTION}
   283    283     set r [catch {execsql {BEGIN TRANSACTION}} msg]
   284    284     execsql {ROLLBACK}