Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Merge changes from trunk. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | remarks-on-checkins |
| Files: | files | file ages | folders |
| SHA1: |
43fa1ecc734c9fd2a678fa9e74cef65e |
| User & Date: | drh 2017-01-10 19:09:05.184 |
Context
|
2017-01-10
| ||
| 20:32 | Improvements to comments and file format docs. check-in: f0c19ea170 user: mistachkin tags: remarks-on-checkins | |
| 19:09 | Merge changes from trunk. check-in: 43fa1ecc73 user: drh tags: remarks-on-checkins | |
| 19:08 | Expand the scope of the new Remark artifact so that it may be attached to either a check-in or a branch. check-in: b78d1a67b7 user: drh tags: remarks-on-checkins | |
| 13:05 | Fix the report logic so that @-bindings in the SQL work the same as $- and :-bindings. check-in: 241f1e2a4f user: drh tags: trunk | |
Changes
Changes to src/db.c.
| ︙ | ︙ | |||
1134 1135 1136 1137 1138 1139 1140 1141 1142 |
** opened is slot 0. The "temp" database is slot 1. Attached databases
** are slots 2 and higher.
**
** Return -1 if zLabel does not match any open database.
*/
int db_database_slot(const char *zLabel){
int iSlot = -1;
Stmt q;
if( g.db==0 ) return iSlot;
| > | > | 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 |
** opened is slot 0. The "temp" database is slot 1. Attached databases
** are slots 2 and higher.
**
** Return -1 if zLabel does not match any open database.
*/
int db_database_slot(const char *zLabel){
int iSlot = -1;
int rc;
Stmt q;
if( g.db==0 ) return iSlot;
rc = db_prepare_ignore_error(&q, "PRAGMA database_list");
if( rc!=SQLITE_OK ) return iSlot;
while( db_step(&q)==SQLITE_ROW ){
if( fossil_strcmp(db_column_text(&q,1),zLabel)==0 ){
iSlot = db_column_int(&q, 0);
break;
}
}
db_finalize(&q);
|
| ︙ | ︙ |
Changes to src/makemake.tcl.
| ︙ | ︙ | |||
1611 1612 1613 1614 1615 1616 1617 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 LDFLAGS = $(LDFLAGS) /MANIFEST !else LDFLAGS = $(LDFLAGS) /NODEFAULTLIB:msvcrt /MANIFEST:NO !endif !if $(FOSSIL_ENABLE_WINXP)!=0 | | | 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 LDFLAGS = $(LDFLAGS) /MANIFEST !else LDFLAGS = $(LDFLAGS) /NODEFAULTLIB:msvcrt /MANIFEST:NO !endif !if $(FOSSIL_ENABLE_WINXP)!=0 XPCFLAGS = $(XPCFLAGS) /D_WIN32_WINNT=0x0501 /D_USING_V110_SDK71_=1 CFLAGS = $(CFLAGS) $(XPCFLAGS) !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.02 !else XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.01 !endif LDFLAGS = $(LDFLAGS) $(XPLDFLAGS) |
| ︙ | ︙ |
Changes to src/report.c.
| ︙ | ︙ | |||
914 915 916 917 918 919 920 |
return SQLITE_ERROR;
}
nVar = sqlite3_bind_parameter_count(pStmt);
for(i=1; i<=nVar; i++){
const char *zVar = sqlite3_bind_parameter_name(pStmt, i);
if( zVar==0 ) continue;
| | | 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 |
return SQLITE_ERROR;
}
nVar = sqlite3_bind_parameter_count(pStmt);
for(i=1; i<=nVar; i++){
const char *zVar = sqlite3_bind_parameter_name(pStmt, i);
if( zVar==0 ) continue;
if( zVar[0]!='$' && zVar[0]!='@' && zVar[0]!=':' ) continue;
if( !fossil_islower(zVar[1]) ) continue;
if( strcmp(zVar, "$login")==0 ){
sqlite3_bind_text(pStmt, i, g.zLogin, -1, SQLITE_TRANSIENT);
}else{
sqlite3_bind_text(pStmt, i, P(zVar+1), -1, SQLITE_TRANSIENT);
}
}
|
| ︙ | ︙ |
Changes to win/Makefile.msc.
| ︙ | ︙ | |||
208 209 210 211 212 213 214 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 LDFLAGS = $(LDFLAGS) /MANIFEST !else LDFLAGS = $(LDFLAGS) /NODEFAULTLIB:msvcrt /MANIFEST:NO !endif !if $(FOSSIL_ENABLE_WINXP)!=0 | | | 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 LDFLAGS = $(LDFLAGS) /MANIFEST !else LDFLAGS = $(LDFLAGS) /NODEFAULTLIB:msvcrt /MANIFEST:NO !endif !if $(FOSSIL_ENABLE_WINXP)!=0 XPCFLAGS = $(XPCFLAGS) /D_WIN32_WINNT=0x0501 /D_USING_V110_SDK71_=1 CFLAGS = $(CFLAGS) $(XPCFLAGS) !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.02 !else XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.01 !endif LDFLAGS = $(LDFLAGS) $(XPLDFLAGS) |
| ︙ | ︙ |