/ Check-in [5995cb15]
Login

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

Overview
Comment:Change the name of the shared-memory file on windows from *-wal-index to *-shm, for consistency with unix.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 5995cb15080cfb707ddda501f975673f658106f7
User & Date: drh 2010-06-25 12:52:47
Context
2010-06-25
14:17
Fix up a branch in sqlite3ValueFromExpr() so that we can achieve full branch test coverage regardless of whether or not SQLITE_ENABLE_STAT2 is used. check-in: af471ed7 user: drh tags: trunk
12:52
Change the name of the shared-memory file on windows from *-wal-index to *-shm, for consistency with unix. check-in: 5995cb15 user: drh tags: trunk
11:35
Modify the merge-sort in wal.c so that it does not use recursion. check-in: daea6c05 user: dan tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/os_win.c.

  1386   1386     pNew = sqlite3_malloc( sizeof(*pShmNode) + nName + 15 );
  1387   1387     if( pNew==0 ){
  1388   1388       sqlite3_free(p);
  1389   1389       return SQLITE_NOMEM;
  1390   1390     }
  1391   1391     memset(pNew, 0, sizeof(*pNew));
  1392   1392     pNew->zFilename = (char*)&pNew[1];
  1393         -  sqlite3_snprintf(nName+15, pNew->zFilename, "%s-wal-index", pDbFd->zPath);
         1393  +  sqlite3_snprintf(nName+15, pNew->zFilename, "%s-shm", pDbFd->zPath);
  1394   1394   
  1395   1395     /* Look to see if there is an existing winShmNode that can be used.
  1396   1396     ** If no matching winShmNode currently exists, create a new one.
  1397   1397     */
  1398   1398     winShmEnterMutex();
  1399   1399     for(pShmNode = winShmNodeList; pShmNode; pShmNode=pShmNode->pNext){
  1400   1400       /* TBD need to come up with better match here.  Perhaps