Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix merge conflict with trunk |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | multi-thread |
| Files: | files | file ages | folders |
| SHA1: |
acd718448f30b237ac7c709e7cef8709 |
| User & Date: | jan.nijtmans 2014-12-06 16:57:00.000 |
Context
|
2017-08-31
| ||
| 02:00 | Merge trunk check-in: d15c1ba0f9 user: jan.nijtmans tags: multi-thread | |
|
2014-12-06
| ||
| 16:57 | Fix merge conflict with trunk check-in: acd718448f user: jan.nijtmans tags: multi-thread | |
| 15:57 | merge trunk check-in: e5a1100bcc user: jan.nijtmans tags: multi-thread | |
Changes
Changes to src/db.c.
| ︙ | ︙ | |||
1131 1132 1133 1134 1135 1136 1137 |
#endif
fossil_panic("not a valid repository: %s", zDbName);
}
}
g.zRepositoryName = mprintf("%s", zDbName);
db_open_or_attach(g.zRepositoryName, "repository", 0);
g.repositoryOpen = 1;
| < < > > | 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 |
#endif
fossil_panic("not a valid repository: %s", zDbName);
}
}
g.zRepositoryName = mprintf("%s", zDbName);
db_open_or_attach(g.zRepositoryName, "repository", 0);
g.repositoryOpen = 1;
#if USE_SYSTEM_SQLITE+0==1
g.maxWorkerThreads = db_get_int("max-wthreads", 0);
#endif
/* Cache "allow-symlinks" option, because we'll need it on every stat call */
g.allowSymlinks = db_get_boolean("allow-symlinks", 0);
}
/*
** Flags for the db_find_and_open_repository() function.
*/
#if INTERFACE
#define OPEN_OK_NOT_FOUND 0x001 /* Do not error out if not found */
|
| ︙ | ︙ |