Fix various spelling errors still found in code

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

diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
index 1465865b06ce023a13b235317dd6df18787d9707..6b6172aca782e1ea80006ec516e3cfd193bce195 100644 (file)
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -602,7 +602,7 @@ void CorruptedPages::zero_out_free_pages()
           die("Can't zero out corrupted page " UINT32PF " of tablespace %s",
               *page_it, space_name.c_str());
         msg("Corrupted page " UINT32PF
-            " of tablespace %s was successfuly fixed.",
+            " of tablespace %s was successfully fixed.",
             *page_it, space_name.c_str());
       }
     }

diff --git a/mysql-test/main/dyncol.result b/mysql-test/main/dyncol.result
index 7bc011ece87cd7ab8cb1a9893f709960c2dc9fd7..a57b524800221dc45be3953235ea2c67bea01fd9 100644 (file)
--- a/mysql-test/main/dyncol.result
+++ b/mysql-test/main/dyncol.result
@@ -1508,7 +1508,7 @@ select column_get(column_create("1212", 2, "адын", 1, 3, 3), "4" as int);
 column_get(column_create("1212", 2, "адын", 1, 3, 3), "4" as int)
 NULL
 set names latin1;
-# column existance test (names)
+# column existence test (names)
 set names utf8;
 select column_exists(column_create("адын", 1212), "адын");
 column_exists(column_create("адын", 1212), "адын")

diff --git a/mysql-test/main/dyncol.test b/mysql-test/main/dyncol.test
index c0835de8c442d9355a9f1cb2e91648a1c8f1d4a7..206c78a8775eb7335625460a44bf596c2b3ca845 100644 (file)
--- a/mysql-test/main/dyncol.test
+++ b/mysql-test/main/dyncol.test
@@ -689,7 +689,7 @@ select column_get(column_create("1212", 2, "адын", 1, 3, 3), 4 as int);
 select column_get(column_create("1212", 2, "адын", 1, 3, 3), "4" as int);
 set names latin1;
 
---echo # column existance test (names)
+--echo # column existence test (names)
 set names utf8;
 select column_exists(column_create("адын", 1212), "адын");
 select column_exists(column_create("адын", 1212), "aады");

diff --git a/mysql-test/suite/archive/discover.result b/mysql-test/suite/archive/discover.result
index 99bb955ea2422881be0cf427027c5e92abca8195..74ba37523735bc8888dd55263d7cce610359007d 100644 (file)
--- a/mysql-test/suite/archive/discover.result
+++ b/mysql-test/suite/archive/discover.result
@@ -84,7 +84,7 @@ drop table t1;
 db.opt
 t0.ARZ
 #
-# discover of table non-existance on drop
+# discover of table non-existence on drop
 #
 select * from t0;
 a

diff --git a/mysql-test/suite/archive/discover.test b/mysql-test/suite/archive/discover.test
index 4ab35cf11151fa20e9c72d7a16f1c627f8e7d70a..1bced9edcbc2f7520da74cad0672e9103e79c7bc 100644 (file)
--- a/mysql-test/suite/archive/discover.test
+++ b/mysql-test/suite/archive/discover.test
@@ -67,7 +67,7 @@ drop table t1;
 --list_files $mysqld_datadir/test
 
 --echo #
---echo # discover of table non-existance on drop
+--echo # discover of table non-existence on drop
 --echo #
 select * from t0;
 remove_file $mysqld_datadir/test/t0.ARZ;
@@ -119,7 +119,7 @@ select * from t1;
 --list_files $mysqld_datadir/test
 
 #
-# MDEV-4955 discover of table non-existance on CREATE
+# MDEV-4955 discover of table non-existence on CREATE
 #
 create table t1 (a int) engine=archive;
 select * from t1;

diff --git a/mysql-test/suite/mariabackup/log_page_corruption.result b/mysql-test/suite/mariabackup/log_page_corruption.result
index 91db833622a7d5fe95eec837e9d0c071e0052b83..4dcd21f1e2f701cd04e839e485c797aa46579c43 100644 (file)
--- a/mysql-test/suite/mariabackup/log_page_corruption.result
+++ b/mysql-test/suite/mariabackup/log_page_corruption.result
@@ -98,12 +98,12 @@ test/t3_inc
 ------
 # Full backup prepare
 # "innodb_corrupted_pages" file must not exist after successful prepare
-FOUND 1 /was successfuly fixed.*/ in backup.log
+FOUND 1 /was successfully fixed.*/ in backup.log
 # Check that fixed pages are zero-filled
 # Incremental backup prepare
 # "innodb_corrupted_pages" file must not exist after successful prepare
 # do not remove "innodb_corrupted_pages" in incremental dir
-FOUND 1 /was successfuly fixed.*/ in backup.log
+FOUND 1 /was successfully fixed.*/ in backup.log
 # Check that fixed pages are zero-filled
 # shutdown server
 # remove datadir

diff --git a/mysql-test/suite/mariabackup/log_page_corruption.test b/mysql-test/suite/mariabackup/log_page_corruption.test
index 0151afb96b40a3b6215dfb5eb1c270e8dd6bc744..8931eb1eaf7d39cbedb0590697024755e446eb9f 100644 (file)
--- a/mysql-test/suite/mariabackup/log_page_corruption.test
+++ b/mysql-test/suite/mariabackup/log_page_corruption.test
@@ -323,7 +323,7 @@ exec $XTRABACKUP  --prepare --target-dir=$targetdir > $backuplog;
 --echo # "innodb_corrupted_pages" file must not exist after successful prepare
 --error 1
 --file_exists $targetdir/innodb_corrupted_pages
---let SEARCH_PATTERN=was successfuly fixed.*
+--let SEARCH_PATTERN=was successfully fixed.*
 --let SEARCH_FILE=$backuplog
 --source include/search_pattern_in_file.inc
 
@@ -347,7 +347,7 @@ exec $XTRABACKUP --prepare --target-dir=$targetdir --incremental-dir=$incdir > $
 --file_exists $targetdir/innodb_corrupted_pages
 --echo # do not remove "innodb_corrupted_pages" in incremental dir
 --file_exists $incdir/innodb_corrupted_pages
---let SEARCH_PATTERN=was successfuly fixed.*
+--let SEARCH_PATTERN=was successfully fixed.*
 --let SEARCH_FILE=$backuplog
 --source include/search_pattern_in_file.inc
 

diff --git a/scripts/sys_schema/README.md b/scripts/sys_schema/README.md
index feaf9ff5ee804a82f76e8a12e0cc9fed3a52d4c0..3c90f41f8e0bc931e2c91f06b060712203aa7e35 100644 (file)
--- a/scripts/sys_schema/README.md
+++ b/scripts/sys_schema/README.md
@@ -5367,9 +5367,9 @@ name, then 'TEMPORARY' will be returned.
 
 ##### Parameters
 
-* in_db (VARCHAR(64)): The database name to check for the existance of the table in.
+* in_db (VARCHAR(64)): The database name to check for the existence of the table in.
 
-* in_table (VARCHAR(64)): The name of the table to check the existance of.
+* in_table (VARCHAR(64)): The name of the table to check the existence of.
 
 * out_exists ENUM('', 'BASE TABLE', 'VIEW', 'TEMPORARY'):  The return value: whether the table exists. The value is one of:
    - ''           - the table does not exist neither as a base table, view, nor temporary table.

diff --git a/scripts/sys_schema/procedures/table_exists.sql b/scripts/sys_schema/procedures/table_exists.sql
index 6f487f2f3414eb6f8887ba47d8c3fa704161418a..e06d018308f1ea111c602bf7e4034956ec7e743e 100644 (file)
--- a/scripts/sys_schema/procedures/table_exists.sql
+++ b/scripts/sys_schema/procedures/table_exists.sql
@@ -34,10 +34,10 @@ CREATE DEFINER='mariadb.sys'@'localhost' PROCEDURE table_exists (
              -----------
 
              in_db (VARCHAR(64)):
-               The database name to check for the existance of the table in.
+               The database name to check for the existence of the table in.
 
              in_table (VARCHAR(64)):
-               The name of the table to check the existance of.
+               The name of the table to check the existence of.
 
              out_exists ENUM('''', ''BASE TABLE'', ''VIEW'', ''TEMPORARY''):
                The return value: whether the table exists. The value is one of:

diff --git a/sql/semisync_master_ack_receiver.h b/sql/semisync_master_ack_receiver.h
index 138f7b5aeed8bb254b4db0b9b68773b73fd59ace..b75cb7b76cb3da108b622abcb72ded4296f60308 100644 (file)
--- a/sql/semisync_master_ack_receiver.h
+++ b/sql/semisync_master_ack_receiver.h
@@ -183,7 +183,7 @@ public:
 
   bool listen_on_sockets()
   {
-    /* Reinitialze the fds with active fds before calling select */
+    /* Reinitialize the fds with active fds before calling select */
     m_fds= m_init_fds;
     struct timeval tv= {1,0};
     /* select requires max fd + 1 for the first argument */

diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 03df92cd484b7fe5d370eb64e1af99d311fe67ae..a650b6a393e0918347e692d38a9dcb6015959c2b 100644 (file)
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -4357,7 +4357,7 @@ int create_table_impl(THD *thd,
       else if (options.if_not_exists())
       {
         /*
-          We never come here as part of normal create table as table existance
+          We never come here as part of normal create table as table existence
           is  checked in open_and_lock_tables(). We may come here as part of
           ALTER TABLE when converting a table for a distributed engine to a
           a local one.

diff --git a/storage/maria/ha_s3.cc b/storage/maria/ha_s3.cc
index d5efcbafd86f0ad6721a2dec4c7d8810c370a05b..0fd5811e2b670ef48e4679b1847a0337a2d577a5 100644 (file)
--- a/storage/maria/ha_s3.cc
+++ b/storage/maria/ha_s3.cc
@@ -789,13 +789,13 @@ static int s3_discover_table(handlerton *hton, THD* thd, TABLE_SHARE *share)
    @return 1 frm exists
 */
 
-static int s3_discover_table_existance(handlerton *hton, const char *db,
+static int s3_discover_table_existence(handlerton *hton, const char *db,
                                        const char *table_name)
 {
   S3_INFO s3_info;
   ms3_st *s3_client;
   int res;
-  DBUG_ENTER("s3_discover_table_existance");
+  DBUG_ENTER("s3_discover_table_existence");
 
   /* Ignore names in "mysql" database to speed up boot */
   if (!strcmp(db, MYSQL_SCHEMA_NAME.str))
@@ -1019,7 +1019,7 @@ static int ha_s3_init(void *p)
   s3_hton->table_options= s3_table_option_list;
   s3_hton->discover_table= s3_discover_table;
   s3_hton->discover_table_names= s3_discover_table_names;
-  s3_hton->discover_table_existence= s3_discover_table_existance;
+  s3_hton->discover_table_existence= s3_discover_table_existence;
   s3_hton->notify_tabledef_changed= s3_notify_tabledef_changed;
   s3_hton->create_partitioning_metadata= s3_create_partitioning_metadata;
   s3_hton->tablefile_extensions= no_exts;