/ Check-in [ec31a529]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Remove all references to SQLITE_OMIT_TRACE. Tracing is always enabled. Ticket #361. (CVS 1032)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: ec31a5292cbc5d2fb68449838b929638f48e31a7
User & Date: drh 2003-06-23 11:06:02
Context
2003-06-23
15:15
Remove a surplus "return" statement accidentaly left in check-in (1032). (CVS 1033) check-in: c697410a user: drh tags: trunk
11:06
Remove all references to SQLITE_OMIT_TRACE. Tracing is always enabled. Ticket #361. (CVS 1032) check-in: ec31a529 user: drh tags: trunk
2003-06-22
01:41
Make sure the source of a PULL opcode is not an ephemeral string. Ticket #360. (CVS 1031) check-in: cb70ee67 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/main.c.

    10     10   **
    11     11   *************************************************************************
    12     12   ** Main file for the SQLite library.  The routines in this file
    13     13   ** implement the programmer interface to the library.  Routines in
    14     14   ** other files are for internal use by SQLite and should not be
    15     15   ** accessed by users of the library.
    16     16   **
    17         -** $Id: main.c,v 1.135 2003/06/12 08:59:01 jplyon Exp $
           17  +** $Id: main.c,v 1.136 2003/06/23 11:06:02 drh Exp $
    18     18   */
    19     19   #include "sqliteInt.h"
    20     20   #include "os.h"
    21     21   #include <ctype.h>
    22     22   
    23     23   /*
    24     24   ** A pointer to this structure is used to communicate information
................................................................................
   924    924   ** sqlite_exec().
   925    925   */
   926    926   void *sqlite_trace(sqlite *db, void (*xTrace)(void*,const char*), void *pArg){
   927    927     void *pOld = db->pTraceArg;
   928    928     db->xTrace = xTrace;
   929    929     db->pTraceArg = pArg;
   930    930     return pOld;
          931  +  return 0;
   931    932   }
   932    933   
   933    934   /*
   934    935   ** This routine is called to create a connection to a database BTree
   935    936   ** driver.  If zFilename is the name of a file, then that file is
   936    937   ** opened and used.  If zFilename is the magic name ":memory:" then
   937    938   ** the database is stored in memory (and is thus forgotten as soon as

Changes to src/sqliteInt.h.

     7      7   **    May you do good and not evil.
     8      8   **    May you find forgiveness for yourself and forgive others.
     9      9   **    May you share freely, never taking more than you give.
    10     10   **
    11     11   *************************************************************************
    12     12   ** Internal interface definitions for SQLite.
    13     13   **
    14         -** @(#) $Id: sqliteInt.h,v 1.192 2003/06/16 19:18:12 drh Exp $
           14  +** @(#) $Id: sqliteInt.h,v 1.193 2003/06/23 11:06:02 drh Exp $
    15     15   */
    16     16   #include "config.h"
    17     17   #include "sqlite.h"
    18     18   #include "hash.h"
    19     19   #include "vdbe.h"
    20     20   #include "parse.h"
    21     21   #include "btree.h"
................................................................................
   314    314     Hash aFunc;                   /* All functions that can be in SQL exprs */
   315    315     int lastRowid;                /* ROWID of most recent insert */
   316    316     int priorNewRowid;            /* Last randomly generated ROWID */
   317    317     int onError;                  /* Default conflict algorithm */
   318    318     int magic;                    /* Magic number for detect library misuse */
   319    319     int nChange;                  /* Number of rows changed */
   320    320     struct Vdbe *pVdbe;           /* List of active virtual machines */
   321         -#ifndef SQLITE_OMIT_TRACE
   322    321     void (*xTrace)(void*,const char*);     /* Trace function */
   323    322     void *pTraceArg;                       /* Argument to the trace function */
   324         -#endif
   325    323   #ifndef SQLITE_OMIT_AUTHORIZATION
   326    324     int (*xAuth)(void*,int,const char*,const char*,const char*,const char*);
   327    325                                   /* Access authorization function */
   328    326     void *pAuthArg;               /* 1st argument to the access auth function */
   329    327   #endif
   330    328   };
   331    329