=== modified file 'sql/sql_select.cc'
--- sql/sql_select.cc	2010-12-27 22:22:05 +0000
+++ sql/sql_select.cc	2011-01-03 04:45:16 +0000
@@ -5366,7 +5366,7 @@
 
     All other cases are in-between these two extremes. Thus the parameter
     'search_depth' controlls the exhaustiveness of the search. The higher the
-    value, the longer the optimizaton time and possibly the better the
+    value, the longer the optimization time and possibly the better the
     resulting plan. The lower the value, the fewer alternative plans are
     estimated, but the more likely to get a bad QEP.
 

=== modified file 'storage/ibmdb2i/db2i_ioBuffers.h'
--- storage/ibmdb2i/db2i_ioBuffers.h	2009-03-09 21:20:14 +0000
+++ storage/ibmdb2i/db2i_ioBuffers.h	2011-01-03 04:42:22 +0000
@@ -290,7 +290,7 @@
       Return a pointer to the next row in the table, where "next" is defined
       by the orientation.
       
-      @param orientaton
+      @param orientation
       @param[out] rrn The relative record number of the row returned. Not reliable
                       if NULL is returned by this function.
       

=== modified file 'storage/innodb_plugin/trx/trx0sys.c'
--- storage/innodb_plugin/trx/trx0sys.c	2010-09-15 16:58:36 +0000
+++ storage/innodb_plugin/trx/trx0sys.c	2011-01-03 04:42:54 +0000
@@ -1343,7 +1343,7 @@
 
 
 /* THESE ARE COPIED FROM NON-HOTBACKUP PART OF THE INNODB SOURCE TREE
-   (This code duplicaton should be fixed at some point!)
+   (This code duplication should be fixed at some point!)
 */
 
 #define	TRX_SYS_SPACE	0	/* the SYSTEM tablespace */

=== modified file 'storage/myisammrg/ha_myisammrg.cc'
--- storage/myisammrg/ha_myisammrg.cc	2010-11-30 21:11:03 +0000
+++ storage/myisammrg/ha_myisammrg.cc	2011-01-03 04:40:56 +0000
@@ -1057,9 +1057,9 @@
 
   /*
     When MERGE table is open, but not yet attached, other threads
-    could flush it, which means call mysql_lock_abort_for_thread()
+    could flush it, which means calling mysql_lock_abort_for_thread()
     on this threads TABLE. 'children_attached' is FALSE in this
-    situaton. Since the table is not locked, return no lock data.
+    situation. Since the table is not locked, return no lock data.
   */
   if (!this->file->children_attached)
     goto end; /* purecov: tested */

=== modified file 'storage/ndb/include/ndbapi/NdbError.hpp'
--- storage/ndb/include/ndbapi/NdbError.hpp	2006-12-23 19:20:40 +0000
+++ storage/ndb/include/ndbapi/NdbError.hpp	2011-01-03 04:43:14 +0000
@@ -66,7 +66,7 @@
     
     /**
      * The error code indicates a permanent error.<br>
-     * (Includes classificatons: NdbError::PermanentError, 
+     * (Includes classifications: NdbError::PermanentError, 
      *  NdbError::ApplicationError, NdbError::NoDataFound,
      *  NdbError::ConstraintViolation, NdbError::SchemaError,
      *  NdbError::UserDefinedError, NdbError::InternalError, and, 

=== modified file 'storage/ndb/include/util/File.hpp'
--- storage/ndb/include/util/File.hpp	2006-12-31 00:32:21 +0000
+++ storage/ndb/include/util/File.hpp	2011-01-03 04:43:41 +0000
@@ -31,7 +31,7 @@
    * Returns time for last contents modification of a file.
    *
    * @param aFileName a filename to check.
-   * @return the time for last contents modificaton of the file.
+   * @return the time for last contents modification of the file.
    */
   static time_t mtime(const char* aFileName);      
 

=== modified file 'storage/xtradb/trx/trx0sys.c'
--- storage/xtradb/trx/trx0sys.c	2010-11-24 13:04:38 +0000
+++ storage/xtradb/trx/trx0sys.c	2011-01-03 04:41:41 +0000
@@ -1667,7 +1667,7 @@
 
 
 /* THESE ARE COPIED FROM NON-HOTBACKUP PART OF THE INNODB SOURCE TREE
-   (This code duplicaton should be fixed at some point!)
+   (This code duplication should be fixed at some point!)
 */
 
 #define	TRX_SYS_SPACE	0	/* the SYSTEM tablespace */