Merge branch '10.0' into 10.1

4 files changed, 7 insertions, 8 deletions

diff --git a/client/mysql.cc b/client/mysql.cc
index a712ed7b1f2..e1f7ba0e5c6 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -3354,7 +3354,7 @@ com_go(String *buffer,char *line __attribute__((unused)))
 
 end:
 
- /* Show warnings if any or error occured */
+ /* Show warnings if any or error occurred */
   if (show_warnings == 1 && (warnings >= 1 || error))
     print_warnings();
 
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c
index 2e6e8030f34..cdeaebf478f 100644
--- a/client/mysql_upgrade.c
+++ b/client/mysql_upgrade.c
@@ -658,7 +658,7 @@ static int get_upgrade_info_file_name(char* name)
 /*
   Read the content of mysql_upgrade_info file and
   compare the version number form file against
-  version number wich mysql_upgrade was compiled for
+  version number which mysql_upgrade was compiled for
 
   NOTE
   This is an optimization to avoid running mysql_upgrade
diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c
index 9b7e1b6c8d4..627fbcb1873 100644
--- a/client/mysqlcheck.c
+++ b/client/mysqlcheck.c
@@ -277,8 +277,8 @@ static void usage(void)
   printf("Usage: %s [OPTIONS] database [tables]\n", my_progname);
   printf("OR     %s [OPTIONS] --databases DB1 [DB2 DB3...]\n",
 	 my_progname);
-  puts("Please consult the MariaDB/MySQL knowledgebase at");
-  puts("http://kb.askmonty.org/v/mysqlcheck for latest information about");
+  puts("Please consult the MariaDB Knowledge Base at");
+  puts("https://mariadb.com/kb/en/mysqlcheck for latest information about");
   puts("this program.");
   print_defaults("my", load_default_groups);
   puts("");
@@ -523,7 +523,6 @@ static int is_view(const char *table)
   {
     fprintf(stderr, "Failed to %s\n", query);
     fprintf(stderr, "Error: %s\n", mysql_error(sock));
-    my_free(query);
     DBUG_RETURN(-1);
   }
   res= mysql_store_result(sock);
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 860e442a290..8fc8f30a9e4 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -1104,7 +1104,7 @@ void do_eval(DYNAMIC_STRING *query_eval, const char *query,
   Run query and dump the result to stderr in vertical format
 
   NOTE! This function should be safe to call when an error
-  has occured and thus any further errors will be ignored(although logged)
+  has occurred and thus any further errors will be ignored (although logged)
 
   SYNOPSIS
   show_query
@@ -1170,7 +1170,7 @@ static void show_query(MYSQL* mysql, const char* query)
   is added to the warning stack, only print @@warning_count-1 warnings.
 
   NOTE! This function should be safe to call when an error
-  has occured and this any further errors will be ignored(although logged)
+  has occurred and this any further errors will be ignored(although logged)
 
   SYNOPSIS
   show_warnings_before_error
@@ -4699,7 +4699,7 @@ void do_sync_with_master2(struct st_command *command, long offset,
         master_pos_wait returned NULL. This indicates that
         slave SQL thread is not started, the slave's master
         information is not initialized, the arguments are
-        incorrect, or an error has occured
+        incorrect, or an error has occurred
       */
       die("%.*s failed: '%s' returned NULL "          \
           "indicating slave SQL thread failure",