Latest round of changes for SQL query optimization.

git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@709 0109f412-320b-0410-ab79-c3e0c5ffbbe6

sql/src/sqlstatement.cpp

@@ -1536,6 +1536,7 @@ Exit:
 //------------------------------------------------------------------------------
 RCODE SQLStatement::getIndexName(
 	FLMBOOL		bMustExist,
+	F_TABLE *	pTable,
 	char *		pszIndexName,
 	FLMUINT		uiIndexNameBufSize,
 	FLMUINT *	puiIndexNameLen,
@@ -1585,6 +1586,19 @@ RCODE SQLStatement::getIndexName(
 			rc = RC_SET( NE_SFLM_INVALID_SQL);
 			goto Exit;
 		}
+		else if (pTable)
+		{
+			if (pTable->uiTableNum != (*ppIndex)->uiTableNum)
+			{
+				setErrInfo( m_uiCurrLineNum,
+						uiTokenLineOffset,
+						SQL_ERR_INDEX_NOT_DEFINED_FOR_TABLE,
+						m_uiCurrLineFilePos,
+						m_uiCurrLineBytes);
+				rc = RC_SET( NE_SFLM_INVALID_SQL);
+				goto Exit;
+			}
+		}
 	}
 
 Exit: