/ Check-in [b2a72be9]
Login

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

Overview
Comment:Release resources prior to bailing out of the btreeCreateTable() routine following an OOM error.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | experimental-mmap
Files: files | file ages | folders
SHA1: b2a72be9bab77f050bef75477a278a6294d3e854
User & Date: drh 2013-04-03 21:23:28
Context
2013-04-04
00:40
Try to use mmap() to speed access to the database file on windows, linux, and mac. check-in: fff2be60 user: drh tags: trunk
2013-04-03
21:23
Release resources prior to bailing out of the btreeCreateTable() routine following an OOM error. Closed-Leaf check-in: b2a72be9 user: drh tags: experimental-mmap
20:04
Remove an unreachable branch in the direct blob I/O logic of btree.c. check-in: f97d7274 user: drh tags: experimental-mmap
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/btree.c.

7238
7239
7240
7241
7242
7243
7244

7245
7246
7247
7248
7249
7250
7251
7252
7253
7254
7255
7256
7257
      u8 eType = 0;
      Pgno iPtrPage = 0;

      /* Save the positions of any open cursors. This is required in
      ** case they are holding a reference to an xFetch reference
      ** corresponding to page pgnoRoot.  */
      rc = saveAllCursors(pBt, 0, 0);

      if( rc!=SQLITE_OK ){
        return rc;
      }

      releasePage(pPageMove);

      /* Move the page currently at pgnoRoot to pgnoMove. */
      rc = btreeGetPage(pBt, pgnoRoot, &pRoot, 0, 0);
      if( rc!=SQLITE_OK ){
        return rc;
      }
      rc = ptrmapGet(pBt, pgnoRoot, &eType, &iPtrPage);
      if( eType==PTRMAP_ROOTPAGE || eType==PTRMAP_FREEPAGE ){







>




<
<







7238
7239
7240
7241
7242
7243
7244
7245
7246
7247
7248
7249


7250
7251
7252
7253
7254
7255
7256
      u8 eType = 0;
      Pgno iPtrPage = 0;

      /* Save the positions of any open cursors. This is required in
      ** case they are holding a reference to an xFetch reference
      ** corresponding to page pgnoRoot.  */
      rc = saveAllCursors(pBt, 0, 0);
      releasePage(pPageMove);
      if( rc!=SQLITE_OK ){
        return rc;
      }



      /* Move the page currently at pgnoRoot to pgnoMove. */
      rc = btreeGetPage(pBt, pgnoRoot, &pRoot, 0, 0);
      if( rc!=SQLITE_OK ){
        return rc;
      }
      rc = ptrmapGet(pBt, pgnoRoot, &eType, &iPtrPage);
      if( eType==PTRMAP_ROOTPAGE || eType==PTRMAP_FREEPAGE ){