Fossil

Check-in [569f4b0e]
Login

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

Overview
Comment:Fix the code in db_open_config() that checks the current 'attachment mode' for the configuration database against the requested one.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | omit-db_name
Files: files | file ages | folders
SHA1: 569f4b0e04fb8ff63412d05d8d17a8f6a1fc34d8
User & Date: mistachkin 2016-08-21 02:17:54
Context
2016-08-22
02:22
Slightly improve clarity of the db_database_slot() function. Closed-Leaf check-in: a12d7122 user: mistachkin tags: omit-db_name
2016-08-21
02:17
Fix the code in db_open_config() that checks the current 'attachment mode' for the configuration database against the requested one. check-in: 569f4b0e user: mistachkin tags: omit-db_name
00:42
Merge test updates from trunk. check-in: 5a14b783 user: mistachkin tags: omit-db_name
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/db.c.

1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
** connection so that we can join between the various databases.  In that
** case, invoke this routine with useAttach as 1.
*/
int db_open_config(int useAttach, int isOptional){
  char *zDbName;
  char *zHome;
  if( g.zConfigDbName ){
    int alreadyAttached = db_database_slot("configdb")>=0;
    if( useAttach==alreadyAttached ) return 1; /* Already open. */
    db_close_config();
  }
  zHome = fossil_getenv("FOSSIL_HOME");
#if defined(_WIN32) || defined(__CYGWIN__)
  if( zHome==0 ){
    zHome = fossil_getenv("LOCALAPPDATA");







|







1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
** connection so that we can join between the various databases.  In that
** case, invoke this routine with useAttach as 1.
*/
int db_open_config(int useAttach, int isOptional){
  char *zDbName;
  char *zHome;
  if( g.zConfigDbName ){
    int alreadyAttached = db_database_slot("configdb")>0;
    if( useAttach==alreadyAttached ) return 1; /* Already open. */
    db_close_config();
  }
  zHome = fossil_getenv("FOSSIL_HOME");
#if defined(_WIN32) || defined(__CYGWIN__)
  if( zHome==0 ){
    zHome = fossil_getenv("LOCALAPPDATA");