10 files changed, 16 insertions, 11 deletions
diff --git a/tool/build-all-msvc.bat b/tool/build-all-msvc.bat
index 8f9a1b7b0..83d660deb 100755
--- a/tool/build-all-msvc.bat
+++ b/tool/build-all-msvc.bat
@@ -198,7 +198,7 @@ IF NOT DEFINED ComSpec (
 
 REM
 REM NOTE: This batch file requires the VcInstallDir environment variable to be
-REM       set.  Tyipcally, this means this batch file needs to be run from an
+REM       set.  Typically, this means this batch file needs to be run from an
 REM       MSVC command prompt.
 REM
 IF NOT DEFINED VCINSTALLDIR (
diff --git a/tool/genfkey.README b/tool/genfkey.README
index 57cdff87f..560994504 100644
--- a/tool/genfkey.README
+++ b/tool/genfkey.README
@@ -63,7 +63,7 @@ CAPABILITIES
 
 LIMITATIONS
 
-  Apart from those limitiations described above:
+  Apart from those limitations described above:
 
     * Implicit mapping to composite primary keys is not supported. If
       a parent table has a composite primary key, then any child table
@@ -108,7 +108,7 @@ USAGE
 
   If errors are found and the --ignore-errors option is passed, then
   no error messages are printed. No "CREATE TRIGGER" statements are generated
-  for foriegn-key definitions that contained errors, they are silently
+  for foreign-key definitions that contained errors, they are silently
   ignored by subsequent processing.
 
   All triggers generated by this command have names that match the pattern
@@ -129,7 +129,7 @@ USAGE
   they will be printed to stdout, but this can be configured using other
   dot-commands (i.e. ".output").
 
-  The simplest way to activate the foriegn key definitions in a database
+  The simplest way to activate the foreign key definitions in a database
   is simply to open it using the shell tool and enter the command 
   ".genfkey --exec":
 
diff --git a/tool/lemon.c b/tool/lemon.c
index 5747520b6..f0f2c8d72 100644
--- a/tool/lemon.c
+++ b/tool/lemon.c
@@ -3695,7 +3695,7 @@ PRIVATE int compute_action(struct lemon *lemp, struct action *ap)
   switch( ap->type ){
     case SHIFT:  act = ap->x.stp->statenum;                        break;
     case SHIFTREDUCE: {
-      /* Since a SHIFT is inherient after a prior REDUCE, convert any
+      /* Since a SHIFT is inherent after a prior REDUCE, convert any
       ** SHIFTREDUCE action with a nonterminal on the LHS into a simple
       ** REDUCE action: */
       if( ap->sp->index>=lemp->nterminal
diff --git a/tool/lempar.c b/tool/lempar.c
index 851a0e2e5..74314efea 100644
--- a/tool/lempar.c
+++ b/tool/lempar.c
@@ -13,7 +13,7 @@
 **
 ** The "lemon" program processes an LALR(1) input grammar file, then uses
 ** this template to construct a parser.  The "lemon" program inserts text
-** at each "%%" line.  Also, any "P-a-r-s-e" identifer prefix (without the
+** at each "%%" line.  Also, any "P-a-r-s-e" identifier prefix (without the
 ** interstitial "-" characters) contained in this template is changed into
 ** the value of the %name directive from the grammar.  Otherwise, the content
 ** of this template is copied straight through into the generate parser
diff --git a/tool/mkctimec.tcl b/tool/mkctimec.tcl
index 6a96c063b..d9f462859 100755
--- a/tool/mkctimec.tcl
+++ b/tool/mkctimec.tcl
@@ -320,6 +320,7 @@ set value_options {
   SQLITE_ENABLE_LOCKING_STYLE
   SQLITE_EXTRA_AUTOEXT
   SQLITE_EXTRA_INIT
+  SQLITE_EXTRA_INIT_MUTEXED
   SQLITE_EXTRA_SHUTDOWN
   SQLITE_FTS3_MAX_EXPR_DEPTH
   SQLITE_INTEGRITY_CHECK_ERROR_MAX
diff --git a/tool/mkpragmatab.tcl b/tool/mkpragmatab.tcl
index 81ef0ea00..70988cf82 100644
--- a/tool/mkpragmatab.tcl
+++ b/tool/mkpragmatab.tcl
@@ -528,10 +528,13 @@ foreach f [lsort [array names allflags]] {
   set fv [expr {$fv*2}]
 }
 
-# Sort the column lists so that longer column lists occur first
+# Sort the column lists so that longer column lists occur first.
+# In the event of a tie, sort column lists lexicographically.
 #
 proc colscmp {a b} {
-  return [expr {[llength $b] - [llength $a]}]
+  set rc [expr {[llength $b] - [llength $a]}]
+  if {$rc} {return $rc}
+  return [string compare $a $b]
 }
 set cols_list [lsort -command colscmp $cols_list]
 
diff --git a/tool/soak1.tcl b/tool/soak1.tcl
index 846f90593..e09c566b8 100644
--- a/tool/soak1.tcl
+++ b/tool/soak1.tcl
@@ -4,7 +4,7 @@
 #
 #    tclsh soak1.tcl local-makefile.mk ?target? ?scenario?
 #
-# This generates many variations on local-makefile.mk (by modifing
+# This generates many variations on local-makefile.mk (by modifying
 # the OPT = lines) and runs them will fulltest, one by one.  The
 # constructed makefiles are named "soak1.mk".
 #
diff --git a/tool/sqldiff.c b/tool/sqldiff.c
index bb26daf13..44bf488f8 100644
--- a/tool/sqldiff.c
+++ b/tool/sqldiff.c
@@ -205,7 +205,7 @@ static char **columnNames(
   int naz = 0;             /* Number of entries in az[] */
   sqlite3_stmt *pStmt;     /* SQL statement being run */
   char *zPkIdxName = 0;    /* Name of the PRIMARY KEY index */
-  int truePk = 0;          /* PRAGMA table_info indentifies the PK to use */
+  int truePk = 0;          /* PRAGMA table_info identifies the PK to use */
   int nPK = 0;             /* Number of PRIMARY KEY columns */
   int i, j;                /* Loop counters */
 
diff --git a/tool/sqlite3_analyzer.c.in b/tool/sqlite3_analyzer.c.in
index 9c11752b8..945c3c5b9 100644
--- a/tool/sqlite3_analyzer.c.in
+++ b/tool/sqlite3_analyzer.c.in
@@ -61,6 +61,7 @@ static int subst_puts(
   }
   sqlite3_fputs(zOut, pOut);
   if( addNewLine ) sqlite3_fputs("\n", pOut);
+  fflush(pOut);
   return TCL_OK;
 }
 #endif /* defined(_WIN32) */
diff --git a/tool/stripccomments.c b/tool/stripccomments.c
index 1bdb5c6b8..1d8525278 100644
--- a/tool/stripccomments.c
+++ b/tool/stripccomments.c
@@ -117,7 +117,7 @@ void do_it_all(void){
 
                https://github.com/emscripten-core/emscripten/issues/23412
 
-               Such regexes will always necessarily be preceeded by a
+               Such regexes will always necessarily be preceded by a
                backslash, though.
 
                It is hypothetically possible for a legitimate comment