/ Check-in [5c0afe70]
Login

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

Overview
Comment:fix merge error and compiler warning
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | apple-osx
Files: files | file ages | folders
SHA1: 5c0afe70a5ee2b378896bf30426823dc5ae4e95c
User & Date: adam 2010-02-26 22:05:01
Context
2010-06-16
19:48
Merge in changes up to and including the 3.6.23.1 release. check-in: 21ca87f6 user: drh tags: apple-osx
2010-02-26
22:05
fix merge error and compiler warning check-in: 5c0afe70 user: adam tags: apple-osx
20:54
More double free paranoia check-in: 62dfb44b user: adam tags: apple-osx
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/pragma.c.

408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
    Btree *pBt = pDb->pBt;
    i64 newMax = 0;
    assert( pBt!=0 );
    if( zRight ){
      newMax = atoi(zRight);
    }
    if( ALWAYS(pBt) ){
      newMax = sqlite3BtreeMaxPageCount(pBt, newMax);
    }
    returnSingleInt(pParse, "max_page_count", &newMax);
  }else

  /*
  **  PRAGMA [database.]secure_delete
  **  PRAGMA [database.]secure_delete=ON/OFF







|







408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
    Btree *pBt = pDb->pBt;
    i64 newMax = 0;
    assert( pBt!=0 );
    if( zRight ){
      newMax = atoi(zRight);
    }
    if( ALWAYS(pBt) ){
      newMax = sqlite3BtreeMaxPageCount(pBt, (int)newMax);
    }
    returnSingleInt(pParse, "max_page_count", &newMax);
  }else

  /*
  **  PRAGMA [database.]secure_delete
  **  PRAGMA [database.]secure_delete=ON/OFF

Changes to src/vdbeapi.c.

418
419
420
421
422
423
424


425
426
427
428
429
430
431
432
433
434
....
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
** This is the top-level implementation of sqlite3_step().  Call
** sqlite3Step() to do most of the work.  If a schema error occurs,
** call sqlite3Reprepare() and try again.
*/
int sqlite3_step(sqlite3_stmt *pStmt){
  int rc = SQLITE_MISUSE;
  Vdbe *v = (Vdbe*)pStmt;


  if( v && (sqlite3SafetyCheckOk(db = v->db))){
    int cnt = 0;
    sqlite3 *db = v->db;
#ifdef SQLITE_ENABLE_SQLRR
    SRRecStep(pStmt);
#endif
    sqlite3_mutex_enter(db->mutex);
    while( (rc = sqlite3Step(v))==SQLITE_SCHEMA
           && cnt++ < 5
           && (rc = sqlite3Reprepare(v))==SQLITE_OK ){
................................................................................
      }else{
        rc = sqlite3_bind_blob(pStmt, i, pValue->z, pValue->n,SQLITE_TRANSIENT);
      }
      break;
    }
    case SQLITE_TEXT: {
#ifdef SQLITE_ENABLE_SQLRR
      SRRecBindText(pStmt, i, zData, nData);
#endif
      rc = bindText(pStmt,i,  pValue->z, pValue->n, SQLITE_TRANSIENT,
                              pValue->enc);
      break;
    }
    default: {
      rc = sqlite3_bind_null(pStmt, i);







>
>


<







 







|







418
419
420
421
422
423
424
425
426
427
428

429
430
431
432
433
434
435
....
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
** This is the top-level implementation of sqlite3_step().  Call
** sqlite3Step() to do most of the work.  If a schema error occurs,
** call sqlite3Reprepare() and try again.
*/
int sqlite3_step(sqlite3_stmt *pStmt){
  int rc = SQLITE_MISUSE;
  Vdbe *v = (Vdbe*)pStmt;
  sqlite3 *db;
	
  if( v && (sqlite3SafetyCheckOk(db = v->db))){
    int cnt = 0;

#ifdef SQLITE_ENABLE_SQLRR
    SRRecStep(pStmt);
#endif
    sqlite3_mutex_enter(db->mutex);
    while( (rc = sqlite3Step(v))==SQLITE_SCHEMA
           && cnt++ < 5
           && (rc = sqlite3Reprepare(v))==SQLITE_OK ){
................................................................................
      }else{
        rc = sqlite3_bind_blob(pStmt, i, pValue->z, pValue->n,SQLITE_TRANSIENT);
      }
      break;
    }
    case SQLITE_TEXT: {
#ifdef SQLITE_ENABLE_SQLRR
      SRRecBindText(pStmt, i, pValue->z, pValue->n);
#endif
      rc = bindText(pStmt,i,  pValue->z, pValue->n, SQLITE_TRANSIENT,
                              pValue->enc);
      break;
    }
    default: {
      rc = sqlite3_bind_null(pStmt, i);