/ Check-in [b547e7ea]
Login

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

Overview
Comment:Add "return rc;" to the end of sqlite3_test_control(). (CVS 4760)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:b547e7ea75294997de4298e30af813f36dfa3b05
User & Date: danielk1977 2008-01-31 15:31:02
Context
2008-01-31
15:53
Make sure virtual table interfaces are not invoked after EOF when the virtual table appears in an outer join. Ticket #2894. (CVS 4761) check-in: face510b user: drh tags: trunk
15:31
Add "return rc;" to the end of sqlite3_test_control(). (CVS 4760) check-in: b547e7ea user: danielk1977 tags: trunk
14:54
Fix assertion fault in sqllimits1.test encountered when auto_vacuum is enabled. Correct the sqllimit1 tests to account for extra pages inserted by auto_vacuum. (CVS 4759) check-in: 9b207d1a 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.416 2008/01/31 14:43:24 drh Exp $
           17  +** $Id: main.c,v 1.417 2008/01/31 15:31:02 danielk1977 Exp $
    18     18   */
    19     19   #include "sqliteInt.h"
    20     20   #include <ctype.h>
    21     21   #ifdef SQLITE_ENABLE_FTS3
    22     22   # include "fts3.h"
    23     23   #endif
    24     24   
................................................................................
   839    839   #endif /* SQLITE_OMIT_UTF16 */
   840    840   
   841    841   /*
   842    842   ** Return the most recent error code generated by an SQLite routine. If NULL is
   843    843   ** passed to this function, we assume a malloc() failed during sqlite3_open().
   844    844   */
   845    845   int sqlite3_errcode(sqlite3 *db){
   846         -  if( !sqlite3SafetyCheckSickOrOk(db) ){
          846  +  if( db && !sqlite3SafetyCheckSickOrOk(db) ){
   847    847       return SQLITE_MISUSE;
   848    848     }
   849    849     if( !db || db->mallocFailed ){
   850    850       return SQLITE_NOMEM;
   851    851     }
   852    852     return db->errCode & db->errMask;
   853    853   }
................................................................................
  1501   1501         int id = va_arg(ap, int);
  1502   1502         rc = sqlite3FaultPending(id);
  1503   1503         break;
  1504   1504       }
  1505   1505   #endif /* SQLITE_OMIT_FAULTINJECTOR */
  1506   1506     }
  1507   1507     va_end(ap);
         1508  +  return rc;
  1508   1509   }