Import SQLite 3.7.6.3.

third_party/sqlite/src/test/lock6.test

Index: third_party/sqlite/src/test/lock6.test
diff --git a/third_party/sqlite/src/test/lock6.test b/third_party/sqlite/src/test/lock6.test
index b64983a04bab9e36b4ef912124e6bf8a5d75de46..b47d18f7a9acfb294a93d0dd5b3232d8c851894e 100644
--- a/third_party/sqlite/src/test/lock6.test
+++ b/third_party/sqlite/src/test/lock6.test
@@ -112,10 +112,10 @@ ifcapable lock_proxy_pragmas&&prefer_proxy_locking {
 
   sqlite3_soft_heap_limit 0
   do_test lock6-1.3 {
-    sqlite3 db test.db
-    catchsql {
-      select * from sqlite_master;
-    } 
+    list [catch {
+      sqlite3 db test.db
+      execsql { select * from sqlite_master } 
+    } msg] $msg
   } {1 {database is locked}}
 
   do_test lock6-1.4 {
@@ -161,8 +161,7 @@ ifcapable lock_proxy_pragmas&&prefer_proxy_locking {
   set env(SQLITE_FORCE_PROXY_LOCKING) $using_proxy
   set sqlite_hostid_num 0
 
-  sqlite3_soft_heap_limit $soft_limit
-
+  sqlite3_soft_heap_limit $cmdlinearg(soft-heap-limit)
 }
       
 finish_test