Fix miscellaneous typos

libmariadb/ma_charset.c

@@ -1212,7 +1212,7 @@ size_t mysql_cset_escape_slashes(const MARIADB_CHARSET_INFO * cset, char *newstr
         escape_overflow = TRUE;
         break;
       }
-      /* copy non escaped character */
+      /* copy non-escaped character */
       *newstr++ = *escapestr;
     }
   }
@@ -1394,7 +1394,7 @@ struct st_madb_os_charset MADB_OS_CHARSET[]=
   {"57011", "ISCII Punjabi", NULL, NULL, MADB_CS_UNSUPPORTED},
   {"65000", "utf-7 Unicode (UTF-7)", NULL, NULL, MADB_CS_UNSUPPORTED},
   {"65001", "utf-8 Unicode (UTF-8)", "utf8", NULL, MADB_CS_EXACT},
-  /* non Windows */
+  /* non-Windows */
 #else
   /* iconv encodings */
   {"ASCII", "US-ASCII", "ascii", "ASCII", MADB_CS_APPROX},

libmariadb/ma_client_plugin.c.in

@@ -302,7 +302,7 @@ int mysql_client_plugin_init()
 /**
   Deinitializes the client plugin layer.
 
-  Unloades all client plugins and frees any associated resources.
+  Unloads all client plugins and frees any associated resources.
 */
 
 void mysql_client_plugin_deinit()

libmariadb/ma_decimal.c

@@ -19,7 +19,7 @@
 /*
 =======================================================================
   NOTE: this library implements SQL standard "exact numeric" type
-  and is not at all generic, but rather intentinally crippled to
+  and is not at all generic, but rather intentionally crippled to
   follow the standard :)
 =======================================================================
   Quoting the standard

libmariadb/ma_dtoa.c

@@ -597,7 +597,7 @@ typedef struct Bigint
 } Bigint;
 
 
-/* A simple stack-memory based allocator for Bigints */
+/* A simple stack-memory-based allocator for Bigints */
 
 typedef struct Stack_alloc
 {

libmariadb/ma_io.c

@@ -56,7 +56,7 @@ MA_FILE *ma_open(const char *location, const char *mode, MYSQL *mysql)
     }
   }
 #ifdef _WIN32
-  /* See CONC-44: we need to support non ascii filenames too, so we convert
+  /* See CONC-44: we need to support non-ascii filenames too, so we convert
      current character set to wchar_t and try to open the file via _wsopen */
   else
    {

libmariadb/ma_net.c

@@ -362,7 +362,7 @@ int ma_net_real_write(NET *net, const char *packet, size_t len)
 }
 
 /*****************************************************************************
- ** Read something from server/clinet
+ ** Read something from server/client
  *****************************************************************************/
 static ulong ma_real_read(NET *net, size_t *complen)
 {
@@ -381,7 +381,7 @@ static ulong ma_real_read(NET *net, size_t *complen)
   {
     while (remain > 0)
     {
-      /* First read is done with non blocking mode */
+      /* First read is done with non-blocking mode */
       if ((length=ma_pvio_cache_read(net->pvio, pos,remain)) <= 0L)
       {
         len= packet_error;

libmariadb/mariadb_lib.c

@@ -325,7 +325,7 @@ static int cli_report_progress(MYSQL *mysql, uchar *packet, uint length)
   return 0;
 }
 
-/* Get the length of next field. Change parameter to point at fieldstart */
+/* Get the length of next field. Change parameter to point at field start */
 ulong
 net_field_length(uchar **packet)
 {
@@ -1917,7 +1917,7 @@ restart:
     mysql->server_capabilities|= (unsigned int)(uint2korr(end + 5)) << 16;
     pkt_scramble_len= uint1korr(end + 7);
 
-    /* check if MariaD2B specific capabilities are available */
+    /* check if MariaDB-specific capabilities are available */
     if (mariadb_connection(mysql) && !(mysql->server_capabilities & CLIENT_MYSQL))
     {
       mysql->extension->mariadb_server_capabilities= (ulonglong) uint4korr(end + 14);
@@ -3004,7 +3004,7 @@ mysql_store_result(MYSQL *mysql)
 
 
 /**************************************************************************
-** Alloc struct for use with unbuffered reads. Data is fetched by domand
+** Alloc struct for use with unbuffered reads. Data is fetched by demand
 ** when calling to mysql_fetch_row.
 ** mysql_data_seek is a noop.
 **

libmariadb/mariadb_rpl.c

@@ -964,7 +964,7 @@ static uint8_t mariadb_rpl_send_semisync_ack(MARIADB_RPL* rpl, MARIADB_RPL_EVENT
   }
   if (!event->is_semi_sync || (event->semi_sync_flags != SEMI_SYNC_ACK_REQ))
   {
-    rpl_set_error(rpl, CR_BINLOG_SEMI_SYNC_ERROR, 0, "This event doesn't require to send semi synchronous acknoledgement");
+    rpl_set_error(rpl, CR_BINLOG_SEMI_SYNC_ERROR, 0, "This event doesn't require to send semi synchronous acknowledgement");
     return 1;
   }
 
@@ -1109,7 +1109,7 @@ MARIADB_RPL_EVENT * STDCALL mariadb_rpl_fetch(MARIADB_RPL *rpl, MARIADB_RPL_EVEN
       RPL_CHECK_POS(ev, ev_end, 1);
       rpl_event->ok= *ev++;
 
-      /* CONC-470: add support for semi snychronous replication */
+      /* CONC-470: add support for semi synchronous replication */
       if (rpl->is_semi_sync && (rpl_event->is_semi_sync= (*ev == SEMI_SYNC_INDICATOR)))
       {
         RPL_CHECK_POS(ev, ev_end, 1);
@@ -1299,7 +1299,7 @@ MARIADB_RPL_EVENT * STDCALL mariadb_rpl_fetch(MARIADB_RPL *rpl, MARIADB_RPL_EVEN
       ev+= 4;
       rpl->fd_header_len= rpl_event->event.format_description.header_len= *ev;
       ev+= 1;
-      /*Post header lengths: 1 byte for each event, non used events/gaps in enum should
+      /*Post header lengths: 1 byte for each event, non-used events/gaps in enum should
                              have a zero value */
       len= ev_end - ev - 5;
       rpl_set_string_and_len(&rpl_event->event.format_description.post_header_lengths, ev, len);
@@ -1765,7 +1765,7 @@ MARIADB_RPL_EVENT * STDCALL mariadb_rpl_fetch(MARIADB_RPL *rpl, MARIADB_RPL_EVEN
          WRITE/UPDATE/DELETE_ROWS_EVENT_COMPRESSED_V1 (MariaDB only)
          WRITE/UPDATE/DELETE_ROWS_EVENT (MySQL only)
 
-         ROWS events are written for row based replicatoin if data is
+         ROWS events are written for row-based replication if data is
          inserted, deleted or updated.
 
          Header

libmariadb/secure/ma_schannel.c

@@ -295,7 +295,7 @@ SECURITY_STATUS ma_schannel_client_handshake(MARIADB_TLS *ctls)
   pvio= ctls->pvio;
   sctx= (SC_CTX *)ctls->ssl;
 
-  /* Initialie securifty context */
+  /* Initialize security context */
   BuffersOut.BufferType= SECBUFFER_TOKEN;
   BuffersOut.cbBuffer= 0;
   BuffersOut.pvBuffer= NULL;

libmariadb/secure/openssl.c

@@ -471,7 +471,7 @@ my_bool ma_tls_connect(MARIADB_TLS *ctls)
   mysql= (MYSQL *)SSL_get_app_data(ssl);
   pvio= mysql->net.pvio;
 
-  /* Set socket to non blocking if not already set */
+  /* Set socket to non-blocking if not already set */
   if (!(blocking= pvio->methods->is_blocking(pvio)))
     pvio->methods->blocking(pvio, FALSE, 0);
 

libmariadb/secure/schannel.c

@@ -410,7 +410,7 @@ typedef struct _MA_SCHANNEL_CREDENTIALS {
 
   Take care of specific TLS versions and cipher suites.
 
-  This function choses between the legacy and new credential structures
+  This function chooses between the legacy and new credential structures
   (SCHANNEL_CRED rsp SCH_CREDENTIALS) based on the OS version and the
   requested cipher suite.