Index: tool/mkkeywordhash.c
==================================================================
--- tool/mkkeywordhash.c
+++ tool/mkkeywordhash.c
@@ -14,11 +14,11 @@
 static const char zHdr[] = 
   "/***** This file contains automatically generated code ******\n"
   "**\n"
   "** The code in this file has been automatically generated by\n"
   "**\n"
-  "**     $Header: /home/drh/sqlite/trans/cvs/sqlite/sqlite/tool/mkkeywordhash.c,v 1.38 2009/06/09 14:27:41 drh Exp $\n"
+  "**   sqlite/tool/mkkeywordhash.c\n"
   "**\n"
   "** The code in this file implements a function that determines whether\n"
   "** or not a given identifier is really an SQL keyword.  The same thing\n"
   "** might be implemented more directly using a hand-written hash table.\n"
   "** But by using this automatically generated code, the size of the code\n"
@@ -299,25 +299,29 @@
   const Keyword *pB = (Keyword*)b;
   int n = pA->len - pB->len;
   if( n==0 ){
     n = strcmp(pA->zName, pB->zName);
   }
+  assert( n!=0 );
   return n;
 }
 static int keywordCompare2(const void *a, const void *b){
   const Keyword *pA = (Keyword*)a;
   const Keyword *pB = (Keyword*)b;
   int n = pB->longestSuffix - pA->longestSuffix;
   if( n==0 ){
     n = strcmp(pA->zName, pB->zName);
   }
+  assert( n!=0 );
   return n;
 }
 static int keywordCompare3(const void *a, const void *b){
   const Keyword *pA = (Keyword*)a;
   const Keyword *pB = (Keyword*)b;
   int n = pA->offset - pB->offset;
+  if( n==0 ) n = pB->id - pA->id;
+  assert( n!=0 );
   return n;
 }
 
 /*
 ** Return a KeywordTable entry with the given id