Fix typos in C comments in miscellaneous files

Author: qobood

client/import_util.h

@@ -29,7 +29,7 @@ enum class KeyOrConstraintType
 };
 
 /**
- * Struct representing a table keyor constraint definition
+ * Struct representing a table key or constraint definition
  */
 struct KeyDefinition
 {

client/mysql.cc

@@ -1475,7 +1475,7 @@ sig_handler mysql_end(int sig)
  User, password, and database are UTF8 encoded, prior to the function,
  this needs to be fixed, in case they contain non-ASCIIs.
 
- Mostly a workaround, to allow existng users with non-ASCII password
+ Mostly a workaround, to allow existing users with non-ASCII password
  to survive upgrade without losing connectivity.
 */
 static void maybe_convert_charset(const char **user, const char **password,
@@ -2415,7 +2415,7 @@ static COMMANDS *find_command(char cmd_char)
 
  /*
  In binary-mode, we disallow all client commands except '\C',
- DELIMITER (see long comand finding find_command(char *))
+ DELIMITER (see long command finding find_command(char *))
  and '\-' (sandbox, see following comment).
  */
  if (real_binary_mode)

client/mysqlcheck.c

@@ -1080,9 +1080,9 @@ static void __attribute__((noinline)) print_result()
  If the error message includes REPAIR TABLE, we assume it means
  we have to run REPAIR on it. In this case we write a nicer message
  than "Please do "REPAIR TABLE""...
- If the message inclused ALTER TABLE then there is something wrong
+ If the message includes ALTER TABLE then there is something wrong
  with the table definition and we have to run ALTER TABLE to fix it.
- Write also a nice error message for this csae.
+ Write also a nice error message for this case.
  */
  if (!strcmp(row[2],"error") && strstr(row[3],"REPAIR "))
  {

client/mysqldump.cc

@@ -4269,7 +4269,7 @@ static void dump_table(const char *table, const char *db, const uchar *hash_key,
 
  /*
  Check --skip-events flag: it is not enough to skip creation of events
- discarding SHOW CREATE EVENT statements generation. The myslq.event
+ discarding SHOW CREATE EVENT statements generation. The mysql.event
  table data should be skipped too.
  */
  if (!opt_events && !cmp_database(db, "mysql") &&

client/mysqlimport.cc

@@ -785,7 +785,7 @@ int table_load_params::load_data(MYSQL *mysql)
  if (exec_sql(mysql, "SET TIME_ZONE=@save_tz;"))
  DBUG_RETURN(1);
  }
- /* Restore constrains and triggers */
+ /* Restore constraints and triggers */
  for (const auto &create_trigger_def : triggers)
  {
  if (exec_sql(mysql, create_trigger_def))

client/mysqltest.cc

@@ -8625,7 +8625,7 @@ void handle_no_error(struct st_command *command)
 
  SYNOPSIS
  read_stmt_results
- stmt - prepare statemet
+ stmt - prepare statement
  mysql - mysql handle
  command - current command pointer
  ds - output buffer where to store result form query
@@ -9534,7 +9534,7 @@ void run_query(struct st_connection *cn, struct st_command *command, int flags)
  rs_output= &rs_cmp_result;
  }
  else
- rs_output= &ds_res; // will be shown to colsole
+ rs_output= &ds_res; // will be shown to console
 
  /*
  Log the query into the output buffer

extra/innochecksum.cc

@@ -382,7 +382,7 @@ open_file(
  @param [in,out]	buf	read the file in buffer
  @param [in]	partial_page_read	enable when to read the
 remaining buffer for first page.
- @param [in]	physical_page_size	Physical/Commpressed page size.
+ @param [in]	physical_page_size	Physical/Compressed page size.
  @param [in,out]	fil_in	file pointer created for the
 tablespace.
  @retval no. of bytes read.
@@ -590,7 +590,7 @@ Rewrite the checksum for the page.
 
 @retval true : do rewrite
 @retval false : skip the rewrite as checksum stored match with
-calculated or page is doublwrite buffer.
+calculated or page is doublewrite buffer.
 */
 static bool update_checksum(byte* page, uint32_t flags)
 {
@@ -1875,7 +1875,7 @@ int main(
 }
 
 if (!read_from_stdin) {
-/* flcose() will flush the data and release the lock if
+/* fclose() will flush the data and release the lock if
 any acquired. */
 fclose(fil_in);
 }

extra/mariabackup/aria_backup_client.cc

@@ -88,7 +88,7 @@ class LogFileCollection
  Skip all existing log files and find the greatest missing log file.
 
  @param datadir - Search files in this directory
- @param start - Start searching from this log number and go downto 1.
+ @param start - Start searching from this log number and go down to 1.
  @param kind - true - search for an existing file
  false - search for a missing file.
  @returns - [1..start] - the greatest found log file

extra/mariabackup/backup_copy.cc

@@ -147,7 +147,7 @@ struct datadir_thread_ctxt_t {
 };
 
 /************************************************************************
-Retirn true if character if file separator */
+Return true if character is file separator */
 bool
 is_path_separator(char c)
 {
@@ -1413,7 +1413,7 @@ bool backup_finish(ds_ctxt *ds_data)
 
 /*
  Drop all empty database directories in the base backup
- that do not exists in the icremental backup.
+ that do not exist in the incremental backup.
 
  This effectively re-plays all DROP DATABASE statements happened
  in between base backup and incremental backup creation time.
@@ -2209,7 +2209,7 @@ static void rocksdb_lock_checkpoint()
 MYSQL_ROW r = mysql_fetch_row(res);
 if (r && r[0] && strcmp(r[0], "1"))
 {
-msg("Could not obtain rocksdb checkpont lock.");
+msg("Could not obtain rocksdb checkpoint lock.");
 exit(EXIT_FAILURE);
 }
 mysql_free_result(res);

extra/mariabackup/backup_mysql.cc

@@ -101,7 +101,7 @@ extern my_bool opt_ssl_verify_server_cert, opt_use_ssl;
 
 /*
  get_os_user()
- Ressemles read_user_name() from libmariadb/libmariadb/mariadb_lib.c.
+ Resembles read_user_name() from libmariadb/libmariadb/mariadb_lib.c.
 */
 
 #if !defined(_WIN32)
@@ -1405,7 +1405,7 @@ are used because donor's wsrep_gtid_domain_id is needed later in joiner.
 Note that at this stage wsrep_local_state_uuid and wsrep_last_committed
 are inconsistent but they are not used in joiner. Joiner will rewrite this file
 at mariabackup --prepare phase and thus there is extra file donor_galera_info.
-Information is needed to maitain wsrep_gtid_domain_id and gtid_binlog_pos
+Information is needed to maintain wsrep_gtid_domain_id and gtid_binlog_pos
 same across the cluster. If joiner node have different wsrep_gtid_domain_id
 we should still receive effective domain id from the donor node,
 and use it.