Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Revert to SQLite trunk's version of shell.c (3.8.7.1 missed a bug-fix already there). Re-add some lines needed for pre-3.8.7 compatibility (needed with configure --disable-internal-sqlite). |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
963c950cd6ac8cc8b9503f20a90ffac8 |
| User & Date: | jan.nijtmans 2014-10-30 15:26:24.294 |
References
|
2014-11-12
| ||
| 14:16 | re-apply [963c950cd6ac8cc8b9503f20a90ffac8e383c1de|963c950cd6]: for pre-3.8.7 compatibility (needed with configure --disable-internal-sqlite) check-in: 3f5defebeb user: jan.nijtmans tags: trunk | |
Context
|
2014-11-12
| ||
| 14:16 | re-apply [963c950cd6ac8cc8b9503f20a90ffac8e383c1de|963c950cd6]: for pre-3.8.7 compatibility (needed with configure --disable-internal-sqlite) check-in: 3f5defebeb user: jan.nijtmans tags: trunk | |
|
2014-10-30
| ||
| 22:08 | Fix an instance of using a NULL database connection pointer when starting the Fossil server in multi-repository mode. check-in: de17e35bf1 user: drh tags: trunk | |
| 15:26 | Revert to SQLite trunk's version of shell.c (3.8.7.1 missed a bug-fix already there). Re-add some lines needed for pre-3.8.7 compatibility (needed with configure --disable-internal-sqlite). check-in: 963c950cd6 user: jan.nijtmans tags: trunk | |
|
2014-10-29
| ||
| 02:08 | Update the built-in SQLite to the 3.8.7.1 beta. check-in: 37cfe7ad98 user: drh tags: trunk | |
Changes
Changes to src/shell.c.
| ︙ | ︙ | |||
878 879 880 881 882 883 884 |
#endif
if( p->cnt++==0 && p->showHeader ){
for(i=0; i<nArg; i++){
output_csv(p, azCol[i] ? azCol[i] : "", i<nArg-1);
}
fprintf(p->out,"%s",p->newline);
}
| | | 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 |
#endif
if( p->cnt++==0 && p->showHeader ){
for(i=0; i<nArg; i++){
output_csv(p, azCol[i] ? azCol[i] : "", i<nArg-1);
}
fprintf(p->out,"%s",p->newline);
}
if( nArg>0 ){
for(i=0; i<nArg; i++){
output_csv(p, azArg[i], i<nArg-1);
}
fprintf(p->out,"%s",p->newline);
}
#if defined(WIN32) || defined(_WIN32)
fflush(p->out);
|
| ︙ | ︙ | |||
1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 |
fprintf(pArg->out,"%d,", sqlite3_column_int(pExplain, 2));
fprintf(pArg->out,"%s\n", sqlite3_column_text(pExplain, 3));
}
}
sqlite3_finalize(pExplain);
sqlite3_free(zEQP);
}
/* If the shell is currently in ".explain" mode, gather the extra
** data required to add indents to the output.*/
if( pArg && pArg->mode==MODE_Explain ){
explain_data_prepare(pArg, pStmt);
}
| > > > > > > > > > > > | 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 |
fprintf(pArg->out,"%d,", sqlite3_column_int(pExplain, 2));
fprintf(pArg->out,"%s\n", sqlite3_column_text(pExplain, 3));
}
}
sqlite3_finalize(pExplain);
sqlite3_free(zEQP);
}
#if USE_SYSTEM_SQLITE+0==1
/* Output TESTCTRL_EXPLAIN text of requested */
if( pArg && pArg->mode==MODE_Explain && sqlite3_libversion_number()<3008007 ){
const char *zExplain = 0;
sqlite3_test_control(SQLITE_TESTCTRL_EXPLAIN_STMT, pStmt, &zExplain);
if( zExplain && zExplain[0] ){
fprintf(pArg->out, "%s", zExplain);
}
}
#endif
/* If the shell is currently in ".explain" mode, gather the extra
** data required to add indents to the output.*/
if( pArg && pArg->mode==MODE_Explain ){
explain_data_prepare(pArg, pStmt);
}
|
| ︙ | ︙ |