Fix misc spelling in MariaDB Server repository

Forwarded: no

Gbp-Pq: Name fix-spelling-mariadb.patch

diff --git a/extra/mariabackup/innobackupex.cc b/extra/mariabackup/innobackupex.cc
index 60c38546c09a352d7557d31916cdda538ce7a071..bb5656ae786d4d9de5805d696aeeff6dbd2ef286 100644 (file)
--- a/extra/mariabackup/innobackupex.cc
+++ b/extra/mariabackup/innobackupex.cc
@@ -188,7 +188,7 @@ enum innobackupex_options
        OPT_DATABASES,
        OPT_DECOMPRESS,
 
-       /* options wich are passed directly to xtrabackup */
+       /* options which are passed directly to xtrabackup */
        OPT_CLOSE_FILES,
        OPT_COMPACT,
        OPT_COMPRESS,
@@ -447,7 +447,7 @@ static struct my_option ibx_long_options[] =
        {"startup-wait-timeout", OPT_LOCK_WAIT_TIMEOUT,
          "This option specifies time in seconds that mariadb-backup should wait for "
          "BACKUP STAGE START to complete. BACKUP STAGE START has to wait until all "
-         "currently running queries using explicite LOCK TABLES has ended. "
+         "currently running queries using explicit LOCK TABLES has ended. "
          "If there are still such queries when the timeout expires, mariadb-backup "
          "terminates with an error. Default is 0, in which case mariadb-backup waits "
          "indefinitely for BACKUP STAGE START to finish",

diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
index a92d47b281378b68c522da58070bb4a09e2ba250..4ad1aa5bc0538b3e642b5c420c34095b3f6f1d10 100644 (file)
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -219,7 +219,7 @@ uint xtrabackup_compress = FALSE;
 uint xtrabackup_compress_threads;
 ulonglong xtrabackup_compress_chunk_size = 0;
 
-/* sleep interval beetween log copy iterations in log copying thread
+/* sleep interval between log copy iterations in log copying thread
 in milliseconds (default is 1 second) */
 ulint xtrabackup_log_copy_interval = 1000;
 static ulong max_buf_pool_modified_pct;
@@ -1731,7 +1731,7 @@ struct my_option xb_client_options[]= {
     {"startup-wait-timeout", OPT_LOCK_WAIT_TIMEOUT,
      "This option specifies time in seconds that mariadb-backup should wait for "
      "BACKUP STAGE START to complete. BACKUP STAGE START has to wait until all "
-     "currently running queries using explicite LOCK TABLES has ended. "
+     "currently running queries using explicit LOCK TABLES has ended. "
      "If there are still such queries when the timeout expires, mariadb-backup "
      "terminates with an error. Default is 0, in which case mariadb-backup waits "
      "indefinitely for BACKUP STAGE START to finish",
@@ -5823,7 +5823,7 @@ void CorruptedPages::backup_fix_ddl(ds_ctxt *ds_data, ds_ctxt *ds_meta)
        }
 
        /* Mariabackup doesn't detect any FILE_OP for the deferred
-       tablespace. There is a possiblity that page0 could've
+       tablespace. There is a possibility that page0 could've
        been corrupted persistently in the disk */
        for (auto space_name: defer_space_names) {
                if (!check_if_skip_table(space_name.c_str())) {

diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc
index d43a3f10ec4c19750844f96f325d8acc844b76d1..1e4ac340a7eb2128e075cb7c8841b94a81882b0e 100644 (file)
--- a/sql/opt_subselect.cc
+++ b/sql/opt_subselect.cc
@@ -6887,7 +6887,7 @@ bool JOIN::choose_subquery_plan(table_map join_tables)
         add("rows", inner_record_count_1).
         add("materialization_cost", materialize_strategy_cost).
         add("in_exist_cost", in_exists_strategy_cost).
-        add("choosen", strategy);
+        add("chosen", strategy);
     }
 
     DBUG_PRINT("info",
@@ -6925,7 +6925,7 @@ bool JOIN::choose_subquery_plan(table_map join_tables)
     {
       Json_writer_object trace_wrapper(thd);
       Json_writer_object trace_subquery(thd, "subquery_plan_revert");
-      trace_subquery.add("choosen", "in_to_exists");
+      trace_subquery.add("chosen", "in_to_exists");
     }
   }
 

diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 96500ff63e3398ad0fabb1935c91a2a95553e010..17c0aac2bffa117c394b170aa72a685923010b0f 100644 (file)
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -15143,7 +15143,7 @@ void JOIN::drop_unused_derived_keys()
       }
       /*
         We dropped all keys except the chosen one and unique keys.
-        The choosen one is stored as the first key (number 0).
+        The chosen one is stored as the first key (number 0).
       */
       tab->ref.key= 0;
     }

diff --git a/storage/connect/odbconn.cpp b/storage/connect/odbconn.cpp
index 520b82d51c2ed5b5a936acfb246f00aad16a29db..a78257087ffe6a2892fa9ebfe07e44ed1cb5c253 100644 (file)
--- a/storage/connect/odbconn.cpp
+++ b/storage/connect/odbconn.cpp
@@ -281,7 +281,7 @@ static CATPARM *AllocCatInfo(PGLOBAL g, CATINFO fid, PCSZ db,
                cap->Status = (UWORD *)PlugSubAlloc(g, NULL, m * sizeof(UWORD));
 
        } catch (int n) {
-               htrc("Exeption %d: %s\n", n, g->Message);
+               htrc("Exception %d: %s\n", n, g->Message);
                cap = NULL;
        } catch (const char *msg) {
                htrc(g->Message, msg);

diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh
index dd8cbd4850ef33c841dbe32c1bf0d96074f0bc90..cc4b86676fb4a4b229e54f4d836122defdbba7c1 100644 (file)
--- a/support-files/mysql.server.sh
+++ b/support-files/mysql.server.sh
@@ -194,7 +194,7 @@ su_kill() {
 
 #
 # Read defaults file from 'basedir'.   If there is no defaults file there
-# check if it's in the old (depricated) place (datadir) and read it from there
+# check if it's in the old (deprecated) place (datadir) and read it from there
 #
 
 extra_args=""