1 files changed, 10 insertions, 10 deletions

diff --git a/kexi/3rdparty/kexisql/src/where.c b/kexi/3rdparty/kexisql/src/where.c
index 2b94ad3c..58b6e3d0 100644
--- a/kexi/3rdparty/kexisql/src/where.c
+++ b/kexi/3rdparty/kexisql/src/where.c
@@ -36,7 +36,7 @@ struct ExprInfo {
 
 /*
 ** An instance of the following structure keeps track of a mapping
-** between VDBE cursor numbers and bittqmasks.  The VDBE cursor numbers
+** between VDBE cursor numbers and bitmasks.  The VDBE cursor numbers
 ** are small integers contained in SrcList_item.iCursor and Expr.iTable
 ** fields.  For any given WHERE clause, we want to track which cursors
 ** are being used, so we assign a single bit in a 32-bit word to track
@@ -391,7 +391,7 @@ WhereInfo *sqliteWhereBegin(
   int nExpr;           /* Number of subexpressions in the WHERE clause */
   int loopMask;        /* One bit set for each outer loop */
   int haveKey;         /* True if KEY is on the stack */
-  ExprMaskSet tqmaskSet; /* The expression tqmask set */
+  ExprMaskSet maskSet; /* The expression tqmask set */
   int iDirectEq[32];   /* Term of the form ROWID==X for the N-th table */
   int iDirectLt[32];   /* Term of the form ROWID<X or ROWID<=X */
   int iDirectGt[32];   /* Term of the form ROWID>X or ROWID>=X */
@@ -407,7 +407,7 @@ WhereInfo *sqliteWhereBegin(
   ** array fills up, the last entry might point to an expression which
   ** contains additional unfactored AND operators.
   */
-  initMaskSet(&tqmaskSet);
+  initMaskSet(&maskSet);
   memset(aExpr, 0, sizeof(aExpr));
   nExpr = exprSplit(ARRAYSIZE(aExpr), aExpr, pWhere);
   if( nExpr==ARRAYSIZE(aExpr) ){
@@ -440,21 +440,21 @@ WhereInfo *sqliteWhereBegin(
   /* Analyze all of the subexpressions.
   */
   for(i=0; i<nExpr; i++){
-    exprAnalyze(&tqmaskSet, &aExpr[i]);
+    exprAnalyze(&maskSet, &aExpr[i]);
 
     /* If we are executing a trigger body, remove all references to
-    ** new.* and old.* tables from the prerequisite tqmasks.
+    ** new.* and old.* tables from the prerequisite masks.
     */
     if( pParse->trigStack ){
       int x;
       if( (x = pParse->trigStack->newIdx) >= 0 ){
-        int tqmask = ~getMask(&tqmaskSet, x);
+        int tqmask = ~getMask(&maskSet, x);
         aExpr[i].prereqRight &= tqmask;
         aExpr[i].prereqLeft &= tqmask;
         aExpr[i].prereqAll &= tqmask;
       }
       if( (x = pParse->trigStack->oldIdx) >= 0 ){
-        int tqmask = ~getMask(&tqmaskSet, x);
+        int tqmask = ~getMask(&maskSet, x);
         aExpr[i].prereqRight &= tqmask;
         aExpr[i].prereqLeft &= tqmask;
         aExpr[i].prereqAll &= tqmask;
@@ -482,7 +482,7 @@ WhereInfo *sqliteWhereBegin(
   for(i=0; i<pTabList->nSrc && i<ARRAYSIZE(iDirectEq); i++){
     int j;
     int iCur = pTabList->a[i].iCursor;    /* The cursor for this table */
-    int tqmask = getMask(&tqmaskSet, iCur);   /* Cursor tqmask for this table */
+    int tqmask = getMask(&maskSet, iCur);   /* Cursor tqmask for this table */
     Table *pTab = pTabList->a[i].pTab;
     Index *pIdx;
     Index *pBestIdx = 0;
@@ -1132,7 +1132,7 @@ WhereInfo *sqliteWhereBegin(
       pLevel->p1 = pLevel->iCur;
       pLevel->p2 = start;
     }
-    loopMask |= getMask(&tqmaskSet, iCur);
+    loopMask |= getMask(&maskSet, iCur);
 
     /* Insert code to test every subexpression that can be completely
     ** computed using the current set of tables.
@@ -1179,7 +1179,7 @@ WhereInfo *sqliteWhereBegin(
   if( pushKey && !haveKey ){
     sqliteVdbeAddOp(v, OP_Recno, pTabList->a[0].iCursor, 0);
   }
-  freeMaskSet(&tqmaskSet);
+  freeMaskSet(&maskSet);
   return pWInfo;
 }