Merge the latest changes of trunk into the session branch.

FossilOrigin-Name: 95d53c44320b9639f2623aa9cc88d0d3e1a3be8f

1 files changed, 7 insertions, 5 deletions

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index d31ed4ae6..ce1e106df 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -2133,11 +2133,13 @@ struct TriggerPrg {
   TriggerPrg *pNext;      /* Next entry in Parse.pTriggerPrg list */
 };
 
-/* Datatype for the bitmask of all attached databases */
+/*
+** The yDbMask datatype for the bitmask of all attached databases.
+*/
 #if SQLITE_MAX_ATTACHED>30
-  typedef sqlite3_uint64 tAttachMask;
+  typedef sqlite3_uint64 yDbMask;
 #else
-  typedef unsigned int tAttachMask;
+  typedef unsigned int yDbMask;
 #endif
 
 /*
@@ -2188,8 +2190,8 @@ struct Parse {
     int iReg;             /* Reg with value of this column. 0 means none. */
     int lru;              /* Least recently used entry has the smallest value */
   } aColCache[SQLITE_N_COLCACHE];  /* One for each column cache entry */
-  tAttachMask writeMask;  /* Start a write transaction on these databases */
-  tAttachMask cookieMask; /* Bitmask of schema verified databases */
+  yDbMask writeMask;   /* Start a write transaction on these databases */
+  yDbMask cookieMask;  /* Bitmask of schema verified databases */
   u8 isMultiWrite;     /* True if statement may affect/insert multiple rows */
   u8 mayAbort;         /* True if statement may throw an ABORT exception */
   int cookieGoto;      /* Address of OP_Goto to cookie verifier subroutine */