← Back to branch summary

~ubuntu-branches/ubuntu/saucy/db/saucy-proposed

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Ondřej Surý
  • Date: 2011-12-05 15:44:35 UTC
  • mfrom: (13.1.26 sid)
  • Revision ID: package-import@ubuntu.com-20111205154435-753djoc1gbrlxgnm
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/prepare.c
247
247
  */
248
248
  for(i=0; i<ArraySize(meta); i++){
249
249
    sqlite3BtreeGetMeta(pDb->pBt, i+1, (u32 *)&meta[i]);
 
250
    if ( rc == SQLITE_OK && db->errCode == SQLITE_BUSY ) {
 
251
      rc = db->errCode;
 
252
      goto initone_error_out;
 
253
    }
250
254
  }
251
255
  pDb->pSchema->schema_cookie = meta[BTREE_SCHEMA_VERSION-1];
252
256
 
471
475
    ** value stored as part of the in-memory schema representation,
472
476
    ** set Parse.rc to SQLITE_SCHEMA. */
473
477
    sqlite3BtreeGetMeta(pBt, BTREE_SCHEMA_VERSION, (u32 *)&cookie);
474
 
    if( cookie!=db->aDb[iDb].pSchema->schema_cookie ){
 
478
    if( pParse->rc == SQLITE_OK && db->errCode == SQLITE_BUSY )
 
479
      pParse->rc = db->errCode;
 
480
    if( pParse->rc != SQLITE_BUSY &&
 
481
      cookie!=db->aDb[iDb].pSchema->schema_cookie )
475
482
      pParse->rc = SQLITE_SCHEMA;
476
 
    }
477
483
 
478
484
    /* Close the transaction, if one was opened. */
479
485
    if( openedTransaction ){