SQLite

Check-in [43e474d3e9]
Login

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

Overview
Comment:Correct two test names to make them unique.
Downloads: Tarball | ZIP 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.599
Context
2012-09-27
12:11
Merge the "PRAGMA busy_timeout" change into trunk. (check-in: 1a679a1ef3 user: drh tags: trunk)
2012-09-07
20:10
Correct two test names to make them unique. (Closed-Leaf check-in: 43e474d3e9 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: 7be5bc3679 user: drh tags: busy-timeout-pragma)
Changes
Unified Diff Ignore Whitespace Patch
Changes to test/lock.test.
︙︙
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284

do_test lock-2.11b {
  db2 eval {PRAGMA busy_timeout}
} {400}
do_test lock-2.12 {
  db2 eval {PRAGMA busy_timeout(0)}
  execsql COMMIT
} {}
do_test lock-2.11b {
  db2 eval {PRAGMA busy_timeout}
} {0}
integrity_check lock-2.12

# Try to start two transactions in a row
#
do_test lock-3.1 {
  execsql {BEGIN TRANSACTION}
  set r [catch {execsql {BEGIN TRANSACTION}} msg]
  execsql {ROLLBACK}








|


|








267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284

do_test lock-2.11b {
  db2 eval {PRAGMA busy_timeout}
} {400}
do_test lock-2.12 {
  db2 eval {PRAGMA busy_timeout(0)}
  execsql COMMIT
} {}
do_test lock-2.12b {
  db2 eval {PRAGMA busy_timeout}
} {0}
integrity_check lock-2.13

# Try to start two transactions in a row
#
do_test lock-3.1 {
  execsql {BEGIN TRANSACTION}
  set r [catch {execsql {BEGIN TRANSACTION}} msg]
  execsql {ROLLBACK}
︙︙