Import SQLite 3.8.7.4.

third_party/sqlite/src/test/lock.test

Index: third_party/sqlite/src/test/lock.test
diff --git a/third_party/sqlite/src/test/lock.test b/third_party/sqlite/src/test/lock.test
index 22f359c1a25284493af324df1068c79fff111e74..6ec85eea3cef5fdc2b67c13776ad7ef871d26cf0 100644
--- a/third_party/sqlite/src/test/lock.test
+++ b/third_party/sqlite/src/test/lock.test
@@ -247,11 +247,34 @@ do_test lock-2.8 {
   execsql {UPDATE t1 SET a = 0 WHERE 0}
   catchsql {BEGIN EXCLUSIVE;} db2
 } {1 {database is locked}}
+do_test lock-2.8b {
+  db2 eval {PRAGMA busy_timeout}
+} {400}
 do_test lock-2.9 {
   db2 timeout 0
   execsql COMMIT
 } {}
+do_test lock-2.9b {
+  db2 eval {PRAGMA busy_timeout}
+} {0}
 integrity_check lock-2.10
+do_test lock-2.11 {
+  db2 eval {PRAGMA busy_timeout(400)}
+  execsql BEGIN
+  execsql {UPDATE t1 SET a = 0 WHERE 0}
+  catchsql {BEGIN EXCLUSIVE;} db2
+} {1 {database is locked}}
+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
 #