aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2003-06-23 11:06:01 +0000
committerdrh <drh@noemail.net>2003-06-23 11:06:01 +0000
commit6cb2c52d9655ca2ae857e43aded74c3ec3f5ff9c (patch)
tree55b31eb1f37e45fef695cf6ef9e7776ebf98a2cb /src
parent8ce10ba65e72d7016f864029969e7a21efa4526a (diff)
downloadsqlite-6cb2c52d9655ca2ae857e43aded74c3ec3f5ff9c.tar.gz
sqlite-6cb2c52d9655ca2ae857e43aded74c3ec3f5ff9c.zip
Remove all references to SQLITE_OMIT_TRACE. Tracing is always enabled.
Ticket #361. (CVS 1032) FossilOrigin-Name: ec31a5292cbc5d2fb68449838b929638f48e31a7
Diffstat (limited to 'src')
-rw-r--r--src/main.c3
-rw-r--r--src/sqliteInt.h4
2 files changed, 3 insertions, 4 deletions
diff --git a/src/main.c b/src/main.c
index 70d55f2e5..56062b69b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
** other files are for internal use by SQLite and should not be
** accessed by users of the library.
**
-** $Id: main.c,v 1.135 2003/06/12 08:59:01 jplyon Exp $
+** $Id: main.c,v 1.136 2003/06/23 11:06:02 drh Exp $
*/
#include "sqliteInt.h"
#include "os.h"
@@ -928,6 +928,7 @@ void *sqlite_trace(sqlite *db, void (*xTrace)(void*,const char*), void *pArg){
db->xTrace = xTrace;
db->pTraceArg = pArg;
return pOld;
+ return 0;
}
/*
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 12ceffbfb..ceb54c727 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
*************************************************************************
** Internal interface definitions for SQLite.
**
-** @(#) $Id: sqliteInt.h,v 1.192 2003/06/16 19:18:12 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.193 2003/06/23 11:06:02 drh Exp $
*/
#include "config.h"
#include "sqlite.h"
@@ -318,10 +318,8 @@ struct sqlite {
int magic; /* Magic number for detect library misuse */
int nChange; /* Number of rows changed */
struct Vdbe *pVdbe; /* List of active virtual machines */
-#ifndef SQLITE_OMIT_TRACE
void (*xTrace)(void*,const char*); /* Trace function */
void *pTraceArg; /* Argument to the trace function */
-#endif
#ifndef SQLITE_OMIT_AUTHORIZATION
int (*xAuth)(void*,int,const char*,const char*,const char*,const char*);
/* Access authorization function */