← Back to branch summary

~ubuntu-branches/ubuntu/vivid/db/vivid-proposed

« back to all changes in this revision

Viewing changes to lang/sql/sqlite/src/vdbe.c

  • Committer: Package Import Robot
  • Author(s): Ondřej Surý
  • Date: 2011-12-05 15:44:35 UTC
  • mfrom: (1.1.10)
  • Revision ID: package-import@ubuntu.com-20111205154435-1rqncut9s3wxba1h
Tags: 5.1.29-1
* Add lintian-override for (not)embedded sqlite in MultiArch
* Generated db_signature is different on each arch
* Update priority of db5.1-util and add missing description of
  db5.1_sql
* Add git-buildpackage configuration
* Imported Upstream version 5.1.29

Show diffs side-by-side

added added

removed removed

Lines of Context:
lang/sql/sqlite/src/vdbe.c
2802
2802
  assert( (p->btreeMask & (1<<iDb))!=0 );
2803
2803
 
2804
2804
  sqlite3BtreeGetMeta(db->aDb[iDb].pBt, iCookie, (u32 *)&iMeta);
 
2805
  if ( rc == SQLITE_OK && db->errCode == SQLITE_BUSY )
 
2806
    rc = db->errCode;
2805
2807
  pOut->u.i = iMeta;
2806
2808
  break;
2807
2809
}
2868
2870
  pBt = db->aDb[pOp->p1].pBt;
2869
2871
  if( pBt ){
2870
2872
    sqlite3BtreeGetMeta(pBt, BTREE_SCHEMA_VERSION, (u32 *)&iMeta);
 
2873
    if (db->errCode == SQLITE_BUSY) {
 
2874
      rc = db->errCode;
 
2875
      break;
 
2876
    }
2871
2877
  }else{
2872
2878
    iMeta = 0;
2873
2879
  }