database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00
Code Activity

Merge all trunk changes since 3.8.1 into the sessions branch.

Browse Source 
FossilOrigin-Name: aa72ea8a004de7fe744fc13baef19d05aea607d5
This commit is contained in:
drh
2013-10-28 22:47:24 +00:00
parent d82d4750a8 7afc8b0c3f
commit d63d4b7bd7
14 changed files with 563 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vdbe.c
View File

@@ -6190,6 +6190,16 @@ case OP_Trace: {
db->xTrace(db->pTraceArg, z);
sqlite3DbFree(db, z);
}
#ifdef SQLITE_USE_FCNTL_TRACE
zTrace = (pOp->p4.z ? pOp->p4.z : p->zSql);
if( zTrace ){
int i;
for(i=0; i<db->nDb; i++){
if( ((1<<i) & p->btreeMask)==0 ) continue;
sqlite3_file_control(db, db->aDb[i].zName, SQLITE_FCNTL_TRACE, zTrace);
}
}
#endif /* SQLITE_USE_FCNTL_TRACE */
#ifdef SQLITE_DEBUG
if( (db->flags & SQLITE_SqlTrace)!=0
&& (zTrace = (pOp->p4.z ? pOp->p4.z : p->zSql))!=0