Fossil

Check-in [49df85ac]
Login

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

Overview
Comment:Set a default busy-timeout of 10 seconds in the "fossil sql" command, before calling sqlite3_exec() to ATTACH auxiliary database files.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 49df85ac05ca91c47ab6c6442deefdbb6c6034622207fe150a12444307d51c5a
User & Date: drh 2021-05-26 01:05:57.955
Context
2021-05-28
01:38
Doc additions for running fossil as a server on OpenBSD, contributed by Thomas Levine in forum post 9a5b913c99. ... (check-in: 62073f6d user: stephan tags: trunk)
2021-05-26
01:05
Set a default busy-timeout of 10 seconds in the "fossil sql" command, before calling sqlite3_exec() to ATTACH auxiliary database files. ... (check-in: 49df85ac user: drh tags: trunk)
2021-05-25
20:58
In db_database_slow(), make sure the prepared statement gets finalized even if the db_prepare_ignore_error() call fails. See forum post 89b5aad9aa for a description of the problem that this fixes. ... (check-in: eddfa8df user: drh tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/sqlcmd.c. 
224
225
226
227
228
229
230

231
232
233
234
235
236
237

  search_sql_setup(db);
  foci_register(db);
  deltafunc_init(db);
  helptext_vtab_register(db);
  builtin_vtab_register(db);
  g.repositoryOpen = 1;
  g.db = db;

  sqlite3_db_config(db, SQLITE_DBCONFIG_MAINDBNAME, "repository");
  db_maybe_set_encryption_key(db, g.zRepositoryName);
  if( g.zLocalDbName ){
    char *zSql = sqlite3_mprintf("ATTACH %Q AS 'localdb' KEY ''",
                                 g.zLocalDbName);
    sqlite3_exec(db, zSql, 0, 0, 0);
    sqlite3_free(zSql);







>








224
225
226
227
228
229
230
231
232
233
234
235
236
237
238

  search_sql_setup(db);
  foci_register(db);
  deltafunc_init(db);
  helptext_vtab_register(db);
  builtin_vtab_register(db);
  g.repositoryOpen = 1;
  g.db = db;
  sqlite3_busy_timeout(db, 10000);
  sqlite3_db_config(db, SQLITE_DBCONFIG_MAINDBNAME, "repository");
  db_maybe_set_encryption_key(db, g.zRepositoryName);
  if( g.zLocalDbName ){
    char *zSql = sqlite3_mprintf("ATTACH %Q AS 'localdb' KEY ''",
                                 g.zLocalDbName);
    sqlite3_exec(db, zSql, 0, 0, 0);
    sqlite3_free(zSql);