database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00
Code Activity

Merge the latest trunk changes into the wal2 branch.

Browse Source 
FossilOrigin-Name: b17f5beab892028fa3e246858f7b34e9104ffb4edd970804e31e5c71bcd5bbc5
This commit is contained in:
drh
2025-05-06 21:38:45 +00:00
parent 3c430b72ca f67058367b
commit bd18310b5f
38 changed files with 2568 additions and 2854 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ext/fts5/test/fts5matchinfo.test
View File

@@ -528,9 +528,12 @@ do_execsql_test 16.0 {
BEGIN EXCLUSIVE;
}
sqlite3 db2 test.db
do_test 16.1 {
catchsql { SELECT * FROM t1 } db2
set rc [catch {
sqlite3 db2 test.db
db2 eval {SELECT * FROM t1}
} errmsg]
lappend rc $errmsg
} {1 {database is locked}}
do_execsql_test 16.2 {
@@ -542,4 +545,3 @@ do_test 16.3 {
} {0 {}}
finish_test