Minor spelling fixes in code comments, docs and output

This commit does not touch any variable names or any other actual code,
and thus should not in any way affect how the code works.

6 files changed, 12 insertions, 12 deletions

diff --git a/include/m_ctype.h b/include/m_ctype.h
index b78443f88f8..da52b4c15a0 100644
--- a/include/m_ctype.h
+++ b/include/m_ctype.h
@@ -376,7 +376,7 @@ typedef size_t (*my_charset_conv_case)(CHARSET_INFO *,
   A structure to return the statistics of a native string copying,
   when no Unicode conversion is involved.
 
-  The stucture is OK to be unitialized before calling a copying routine.
+  The stucture is OK to be uninitialized before calling a copying routine.
   A copying routine must populate the structure as follows:
     - m_source_end_pos must be set by to a non-NULL value
       in the range of the input string.
@@ -425,7 +425,7 @@ struct my_charset_handler_st
   my_charset_conv_case caseup;
   my_charset_conv_case casedn;
 
-  /* Charset dependant snprintf() */
+  /* Charset dependent snprintf() */
   size_t (*snprintf)(CHARSET_INFO *, char *to, size_t n,
                      const char *fmt,
                      ...) ATTRIBUTE_FORMAT_FPTR(printf, 4, 5);
diff --git a/include/my_atomic.h b/include/my_atomic.h
index 896dc2b5c33..1f5d85fcf12 100644
--- a/include/my_atomic.h
+++ b/include/my_atomic.h
@@ -101,7 +101,7 @@
                             sequentially-consistent operation ordering.
 
   We choose implementation as follows: on Windows using Visual C++ the native
-  implementation should be preferrable. When using gcc we prefer the Solaris
+  implementation should be preferable. When using gcc we prefer the Solaris
   implementation before the gcc because of stability preference, we choose gcc
   builtins if available.
 */
diff --git a/include/my_global.h b/include/my_global.h
index 7986a0e21dd..a96c947cf44 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -178,7 +178,7 @@
 
 /*
   The macros below are borrowed from include/linux/compiler.h in the
-  Linux kernel. Use them to indicate the likelyhood of the truthfulness
+  Linux kernel. Use them to indicate the likelihood of the truthfulness
   of a condition. This serves two purposes - newer versions of gcc will be
   able to optimize for branch predication, which could yield siginficant
   performance gains in frequently executed sections of the code, and the
@@ -527,7 +527,7 @@ typedef SOCKET my_socket;
 typedef int	my_socket;	/* File descriptor for sockets */
 #define INVALID_SOCKET -1
 #endif
-/* Type for fuctions that handles signals */
+/* Type for functions that handles signals */
 #define sig_handler RETSIGTYPE
 C_MODE_START
 #ifdef HAVE_SIGHANDLER_T
@@ -857,7 +857,7 @@ static inline double log2(double x)
 
 /*
   Max size that must be added to a so that we know Size to make
-  adressable obj.
+  addressable obj.
 */
 #if SIZEOF_CHARP == 4
 typedef long		my_ptrdiff_t;
@@ -869,7 +869,7 @@ typedef long long	my_ptrdiff_t;
 #define MY_ALIGN_DOWN(A,L) ((A) & ~((L) - 1))
 #define ALIGN_SIZE(A)	MY_ALIGN((A),sizeof(double))
 #define ALIGN_MAX_UNIT  (sizeof(double))
-/* Size to make adressable obj. */
+/* Size to make addressable obj. */
 #define ALIGN_PTR(A, t) ((t*) MY_ALIGN((A), sizeof(double)))
 #define ADD_TO_PTR(ptr,size,type) (type) ((uchar*) (ptr)+size)
 #define PTR_BYTE_DIFF(A,B) (my_ptrdiff_t) ((uchar*) (A) - (uchar*) (B))
diff --git a/include/my_pthread.h b/include/my_pthread.h
index 037ac0a062f..ecb201a60da 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -196,7 +196,7 @@ int sigwait(sigset_t *set, int *sig);
 #endif
 
 #if !defined(HAVE_SIGWAIT) && !defined(HAVE_rts_threads) && !defined(sigwait) && !defined(alpha_linux_port) && !defined(_AIX)
-int sigwait(sigset_t *setp, int *sigp);		/* Use our implemention */
+int sigwait(sigset_t *setp, int *sigp);		/* Use our implementation */
 #endif
 
 
@@ -393,7 +393,7 @@ typedef struct st_safe_mutex_deadlock_t
 
 #ifdef SAFE_MUTEX_DETECT_DESTROY
 /*
-  Used to track the destroying of mutexes. This needs to be a seperate
+  Used to track the destroying of mutexes. This needs to be a separate
   structure because the safe_mutex_t structure could be freed before
   the mutexes are destroyed.
 */
diff --git a/include/mysql/service_thd_rnd.h b/include/mysql/service_thd_rnd.h
index 21133c7889f..13fc1c16839 100644
--- a/include/mysql/service_thd_rnd.h
+++ b/include/mysql/service_thd_rnd.h
@@ -18,7 +18,7 @@
   @file
   This service provides access to the thd-local random number generator.
 
-  It's preferrable over the global one, because concurrent threads
+  It's preferable over the global one, because concurrent threads
   can generate random numbers without fighting each other over the access
   to the shared rnd state.
 */
diff --git a/include/mysql_com.h b/include/mysql_com.h
index 71858c93046..7f445502228 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -152,7 +152,7 @@ enum enum_indicator_type
 */
 #define SCRAMBLE_LENGTH 20
 #define SCRAMBLE_LENGTH_323 8
-/* length of password stored in the db: new passwords are preceeded with '*' */
+/* length of password stored in the db: new passwords are preceded with '*' */
 #define SCRAMBLED_PASSWORD_CHAR_LENGTH (SCRAMBLE_LENGTH*2+1)
 #define SCRAMBLED_PASSWORD_CHAR_LENGTH_323 (SCRAMBLE_LENGTH_323*2)
 
@@ -288,7 +288,7 @@ enum enum_indicator_type
 #endif
 
 /*
-  Gather all possible capabilites (flags) supported by the server
+  Gather all possible capabilities (flags) supported by the server
 
   MARIADB_* flags supported only by MariaDB connector(s).
 */