Fossil SCM
Fix for ticket [45f89e504b4]
Commit
3640618d7146894d59f3556c1063afd18557a925
Parent
a1b7f8e1a9bed46…
2 files changed
+1
+1
M
src/db.c
+1
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -1194,10 +1194,11 @@ | ||
| 1194 | 1194 | ** so this routine is a no-op. |
| 1195 | 1195 | */ |
| 1196 | 1196 | void db_swap_connections(void){ |
| 1197 | 1197 | if( !g.useAttach ){ |
| 1198 | 1198 | sqlite3 *dbTemp = g.db; |
| 1199 | + assert( g.dbConfig!=0 ); | |
| 1199 | 1200 | g.db = g.dbConfig; |
| 1200 | 1201 | g.dbConfig = dbTemp; |
| 1201 | 1202 | } |
| 1202 | 1203 | } |
| 1203 | 1204 | |
| 1204 | 1205 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1194,10 +1194,11 @@ | |
| 1194 | ** so this routine is a no-op. |
| 1195 | */ |
| 1196 | void db_swap_connections(void){ |
| 1197 | if( !g.useAttach ){ |
| 1198 | sqlite3 *dbTemp = g.db; |
| 1199 | g.db = g.dbConfig; |
| 1200 | g.dbConfig = dbTemp; |
| 1201 | } |
| 1202 | } |
| 1203 | |
| 1204 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1194,10 +1194,11 @@ | |
| 1194 | ** so this routine is a no-op. |
| 1195 | */ |
| 1196 | void db_swap_connections(void){ |
| 1197 | if( !g.useAttach ){ |
| 1198 | sqlite3 *dbTemp = g.db; |
| 1199 | assert( g.dbConfig!=0 ); |
| 1200 | g.db = g.dbConfig; |
| 1201 | g.dbConfig = dbTemp; |
| 1202 | } |
| 1203 | } |
| 1204 | |
| 1205 |
+1
| --- src/sync.c | ||
| +++ src/sync.c | ||
| @@ -84,10 +84,11 @@ | ||
| 84 | 84 | const char *zPw = 0; |
| 85 | 85 | int urlOptional = find_option("autourl",0,0)!=0; |
| 86 | 86 | g.dontKeepUrl = find_option("once",0,0)!=0; |
| 87 | 87 | url_proxy_options(); |
| 88 | 88 | db_find_and_open_repository(1); |
| 89 | + db_open_config(0); | |
| 89 | 90 | if( g.argc==2 ){ |
| 90 | 91 | zUrl = db_get("last-sync-url", 0); |
| 91 | 92 | zPw = db_get("last-sync-pw", 0); |
| 92 | 93 | }else if( g.argc==3 ){ |
| 93 | 94 | zUrl = g.argv[2]; |
| 94 | 95 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -84,10 +84,11 @@ | |
| 84 | const char *zPw = 0; |
| 85 | int urlOptional = find_option("autourl",0,0)!=0; |
| 86 | g.dontKeepUrl = find_option("once",0,0)!=0; |
| 87 | url_proxy_options(); |
| 88 | db_find_and_open_repository(1); |
| 89 | if( g.argc==2 ){ |
| 90 | zUrl = db_get("last-sync-url", 0); |
| 91 | zPw = db_get("last-sync-pw", 0); |
| 92 | }else if( g.argc==3 ){ |
| 93 | zUrl = g.argv[2]; |
| 94 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -84,10 +84,11 @@ | |
| 84 | const char *zPw = 0; |
| 85 | int urlOptional = find_option("autourl",0,0)!=0; |
| 86 | g.dontKeepUrl = find_option("once",0,0)!=0; |
| 87 | url_proxy_options(); |
| 88 | db_find_and_open_repository(1); |
| 89 | db_open_config(0); |
| 90 | if( g.argc==2 ){ |
| 91 | zUrl = db_get("last-sync-url", 0); |
| 92 | zPw = db_get("last-sync-pw", 0); |
| 93 | }else if( g.argc==3 ){ |
| 94 | zUrl = g.argv[2]; |
| 95 |