spelling fixes

5 files changed, 16 insertions, 16 deletions

diff --git a/client/mysql_plugin.c b/client/mysql_plugin.c
index ebf04c9a8c3..76108c7a287 100644
--- a/client/mysql_plugin.c
+++ b/client/mysql_plugin.c
@@ -1002,7 +1002,7 @@ found:
 
 static int find_plugin(char *tp_path)
 {
-  /* Check for existance of plugin */
+  /* Check for existence of plugin */
   fn_format(tp_path, plugin_data.so_name, opt_plugin_dir, "", MYF(0));
   if (!file_exists(tp_path))
   {
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c
index e400087a2e8..0594af39451 100644
--- a/client/mysql_upgrade.c
+++ b/client/mysql_upgrade.c
@@ -545,7 +545,7 @@ static int run_query(const char *query, DYNAMIC_STRING *ds_res,
     But mysql_upgrade is tightly bound to a specific server version
     anyway - it was mysql_fix_privilege_tables_sql script embedded
     into its binary - so even if it won't assume anything about server
-    wsrep-ness, it won't be any less server-dependend.
+    wsrep-ness, it won't be any less server-dependent.
   */
   const uchar sql_log_bin[]= "SET SQL_LOG_BIN=0, WSREP_ON=OFF;";
 #else
@@ -758,7 +758,7 @@ static void print_conn_args(const char *tool_name)
 
 
 /*
-  Check and upgrade(if neccessary) all tables
+  Check and upgrade(if necessary) all tables
   in the server using "mysqlcheck --check-upgrade .."
 */
 
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index 4699503d5bc..b109ec858b0 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -2542,7 +2542,7 @@ static Exit_status dump_local_log_entries(PRINT_EVENT_INFO *print_event_info,
     /* read from stdin */
     /*
       Windows opens stdin in text mode by default. Certain characters
-      such as CTRL-Z are interpeted as events and the read() method
+      such as CTRL-Z are interpreted as events and the read() method
       will stop. CTRL-Z is the EOF marker in Windows. to get past this
       you have to open stdin in binary mode. Setmode() is used to set
       stdin in binary mode. Errors on setting this mode result in 
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index afdd2394bc3..2673db0e469 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -2490,7 +2490,7 @@ VAR *var_obtain(const char *name, int len)
 
 
 /*
-  - if variable starts with a $ it is regarded as a local test varable
+  - if variable starts with a $ it is regarded as a local test variable
   - if not it is treated as a environment variable, and the corresponding
   environment variable will be updated
 */
@@ -3325,7 +3325,7 @@ static int replace(DYNAMIC_STRING *ds_str,
   NOTE
   Although mysqltest is executed from cygwin shell, the command will be
   executed in "cmd.exe". Thus commands like "rm" etc can NOT be used, use
-  mysqltest commmand(s) like "remove_file" for that
+  mysqltest command(s) like "remove_file" for that
 */
 
 void do_exec(struct st_command *command)
@@ -6554,7 +6554,7 @@ int read_line(char *buf, int size)
                               start_lineno));
         }
 
-        /* Skip all space at begining of line */
+        /* Skip all space at beginning of line */
 	skip_char= 1;
       }
       else if (end_of_query(c))
@@ -6566,10 +6566,10 @@ int read_line(char *buf, int size)
       }
       else if (c == '}')
       {
-        /* A "}" need to be by itself in the begining of a line to terminate */
+        /* A "}" need to be by itself in the beginning of a line to terminate */
         *p++= c;
 	*p= 0;
-        DBUG_PRINT("exit", ("Found '}' in begining of a line at line: %d",
+        DBUG_PRINT("exit", ("Found '}' in beginning of a line at line: %d",
                             cur_file->lineno));
 	DBUG_RETURN(0);
       }
@@ -7931,7 +7931,7 @@ void handle_error(struct st_command *command,
   {
     /*
       The query after a "--require" failed. This is fine as long the server
-      returned a valid reponse. Don't allow 2013 or 2006 to trigger an
+      returned a valid response. Don't allow 2013 or 2006 to trigger an
       abort_not_supported_test
     */
     if (err_errno == CR_SERVER_LOST ||
@@ -9012,7 +9012,7 @@ int main(int argc, char **argv)
   var_set_string("MYSQLTEST_FILE", cur_file->file_name);
   init_re();
 
-  /* Cursor protcol implies ps protocol */
+  /* Cursor protocol implies ps protocol */
   if (cursor_protocol)
     ps_protocol= 1;
 
@@ -9110,7 +9110,7 @@ int main(int argc, char **argv)
                               abort_on_error);
     
     /*
-      some commmands need to be executed or at least parsed unconditionally,
+      some commands need to be executed or at least parsed unconditionally,
       because they change the grammar.
     */
     ok_to_do= cur_block->ok || command->type == Q_DELIMITER
@@ -9542,7 +9542,7 @@ int main(int argc, char **argv)
     die("Test ended with parsing disabled");
 
   /*
-    The whole test has been executed _sucessfully_.
+    The whole test has been executed _successfully_.
     Time to compare result or save it to record file.
     The entire output from test is in the log file
   */
@@ -9588,7 +9588,7 @@ int main(int argc, char **argv)
 
   verbose_msg("Test has succeeded!");
   timer_output();
-  /* Yes, if we got this far the test has suceeded! Sakila smiles */
+  /* Yes, if we got this far the test has succeeded! Sakila smiles */
   cleanup_and_exit(0);
   return 0; /* Keep compiler happy too */
 }
@@ -10083,7 +10083,7 @@ void free_replace_regex()
   buf_len_p - result buffer length. Will change if the buffer is reallocated
   pattern - regexp pattern to match
   replace - replacement expression
-  string - the string to perform substituions in
+  string - the string to perform substitutions in
   icase - flag, if set to 1 the match is case insensitive
 */
 int reg_replace(char** buf_p, int* buf_len_p, char *pattern,
diff --git a/client/sql_string.cc.dontuse b/client/sql_string.cc.dontuse
index 9679197b207..65b14e36cd1 100644
--- a/client/sql_string.cc.dontuse
+++ b/client/sql_string.cc.dontuse
@@ -267,7 +267,7 @@ bool String::set_or_copy_aligned(const char *str,uint32 arg_length,
   return copy_aligned(str, arg_length, offset, cs);
 }
 
-	/* Copy with charset convertion */
+	/* Copy with charset conversion */
 
 bool String::copy(const char *str, uint32 arg_length,
 		  CHARSET_INFO *from_cs, CHARSET_INFO *to_cs, uint *errors)