General spell fixing in comments and strings

client/mysqldump.c

@@ -6120,7 +6120,7 @@ int main(int argc, char **argv)
     goto err;
 
   /*
-    No reason to explicitely COMMIT the transaction, neither to explicitely
+    No reason to explicitly COMMIT the transaction, neither to explicitly
     UNLOCK TABLES: these will be automatically be done by the server when we
     disconnect now. Saves some code here, some network trips, adds nothing to
     server.

client/mysqltest.cc

@@ -6526,7 +6526,7 @@ int read_line(char *buf, int size)
                               start_lineno));
         }
 
-        /* Skip all space at begining of line */
+        /* Skip all space at beginning of line */
 	skip_char= 1;
       }
       else if (end_of_query(c))
@@ -6538,10 +6538,10 @@ int read_line(char *buf, int size)
       }
       else if (c == '}')
       {
-        /* A "}" need to be by itself in the begining of a line to terminate */
+        /* A "}" need to be by itself in the beginning of a line to terminate */
         *p++= c;
 	*p= 0;
-        DBUG_PRINT("exit", ("Found '}' in begining of a line at line: %d",
+        DBUG_PRINT("exit", ("Found '}' in beginning of a line at line: %d",
                             cur_file->lineno));
 	DBUG_RETURN(0);
       }

debian/mariadb-server-10.2.mysql.init

@@ -25,7 +25,7 @@ SELF=$(cd $(dirname $0); pwd -P)/$(basename $0)
 CONF=/etc/mysql/my.cnf
 MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
 
-# priority can be overriden and "-s" adds output to stderr
+# priority can be overridden and "-s" adds output to stderr
 ERR_LOGGER="logger -p daemon.err -t /etc/init.d/mysql -i"
 
 # Safeguard (relative paths, core dumps..)

debian/mariadb-server-10.2.postinst

@@ -239,7 +239,7 @@ db_stop # in case invoke failes
 # dh_systemd_start doesn't emit anything since we still ship /etc/init.d/mysql.
 # Thus MariaDB server is started via init.d script, which in turn redirects to
 # systemctl. If we upgrade from MySQL mysql.service may be masked, which also
-# means init.d script is disabled. Unmask mysql service explicitely.
+# means init.d script is disabled. Unmask mysql service explicitly.
 # Check first that the command exists, to avoid emitting any warning messages.
 if [ -x "$(command -v deb-systemd-helper)" ]; then
   deb-systemd-helper unmask mysql.service > /dev/null

include/mysql.h

@@ -367,7 +367,7 @@ void STDCALL mysql_server_end(void);
 /*
   mysql_server_init/end need to be called when using libmysqld or
   libmysqlclient (exactly, mysql_server_init() is called by mysql_init() so
-  you don't need to call it explicitely; but you need to call
+  you don't need to call it explicitly; but you need to call
   mysql_server_end() to free memory). The names are a bit misleading
   (mysql_SERVER* to be used when using libmysqlCLIENT). So we add more general
   names which suit well whether you're using libmysqld or libmysqlclient. We

libmysql/libmysql.c

@@ -220,7 +220,7 @@ void STDCALL mysql_server_end()
   }
 #ifdef NOT_NEEDED
   /*
-    The following is not needed as if the program explicitely called
+    The following is not needed as if the program explicitly called
     my_init() then we can assume it will also call my_end().
     The reason to not also do it here is in that case we can't get
     statistics from my_end() to debug log.

mysql-test/extra/rpl_tests/rpl_row_tabledefs.test

@@ -73,7 +73,7 @@ ALTER TABLE t8 ADD e1 INT NOT NULL DEFAULT 0, ADD e2 INT NOT NULL DEFAULT 0,
 # the following INSERTs to pass the mode is switched temprorarily
 set @@global.slave_exec_mode= 'IDEMPOTENT';
 
-# so the inserts are going to be overriden
+# so the inserts are going to be overridden
 INSERT INTO t1_int  VALUES (2, 4, 4711);
 INSERT INTO t1_char VALUES (2, 4, 'Foo is a bar');
 INSERT INTO t1_bit  VALUES (2, 4, b'101', b'11100', b'01');

mysql-test/include/mix2.inc

@@ -54,7 +54,7 @@
 
 # Set the SESSION DEFAULT STORAGE ENGINE to a value <> storage engine
 # to be tested. This must not affect any CREATE TABLE statement, where
-# the storage engine is assigned explicitely,
+# the storage engine is assigned explicitly,
 eval SET SESSION STORAGE_ENGINE = $other_engine_type;
 
 #

mysql-test/lib/t/testMyConfig.t

@@ -129,10 +129,10 @@ my $config3= My::Config->new($test_include_cnf);
 isa_ok( $config3, "My::Config" );
 print $config3;
 is( $config3->value('mysqld', 'basedir'), 'anotherbasedir',
-    "mysqld_basedir has been overriden by value in test_include.cnf");
+    "mysqld_basedir has been overridden by value in test_include.cnf");
 
 is( $config3->value('mysqld', 'option1'), 'values3',
-    "mysqld_option1 has been overriden by value in test_include.cnf");
+    "mysqld_option1 has been overridden by value in test_include.cnf");
 
 is( $config3->value('mysqld', 'option2'), 'value4',
     "mysqld_option2 is from included file");

mysql-test/lib/v1/mysql-test-run.pl

@@ -4133,7 +4133,7 @@ sub valgrind_arguments {
       if -f "$glob_mysql_test_dir/valgrind.supp";
   }
 
-  # Add valgrind options, can be overriden by user
+  # Add valgrind options, can be overridden by user
   mtr_add_arg($args, '%s', $_) for (@valgrind_args);
 
   mtr_add_arg($args, $$exe);

mysql-test/mysql-stress-test.pl

@@ -1079,7 +1079,7 @@ sub log_session_errors
   {
     lock ($log_file_lock);
 
-    #header in the begining of log file
+    #header in the beginning of log file
     if (!-e $stress_log_file)
     {
       stress_log($stress_log_file, 

mysql-test/mysql-test-run.pl

@@ -1385,7 +1385,7 @@ sub command_line_setup {
 
   if ( @opt_cases )
   {
-    # Run big tests if explicitely specified on command line
+    # Run big tests if explicitly specified on command line
     $opt_big_test= 1;
   }
 
@@ -5847,7 +5847,7 @@ sub valgrind_arguments {
     }
   }
 
-  # Add valgrind options, can be overriden by user
+  # Add valgrind options, can be overridden by user
   mtr_add_arg($args, '%s', $_) for (@valgrind_args);
 
   mtr_add_arg($args, $$exe);
@@ -5874,7 +5874,7 @@ sub strace_arguments {
   mtr_add_arg($args, "-f");
   mtr_add_arg($args, "-o%s/var/log/%s.strace", $glob_mysql_test_dir, $mysqld_name);
 
-  # Add strace options, can be overriden by user
+  # Add strace options, can be overridden by user
   mtr_add_arg($args, '%s', $_) for (@strace_args);
 
   mtr_add_arg($args, $$exe);

mysql-test/r/mysqldump.result

@@ -514,7 +514,7 @@ drop database mysqldump_test_db;
 # Check that we don't dump in UTF8 in compatible mode by default,
 # but use the default compiled values, or the values given in
 # --default-character-set=xxx. However, we should dump in UTF8
-# if it is explicitely set.
+# if it is explicitly set.
 CREATE TABLE t1 (a  CHAR(10));
 INSERT INTO t1  VALUES (_latin1 '����');
 

mysql-test/suite/engines/funcs/t/rpl_user_variables.test

@@ -35,7 +35,7 @@ insert into t1 values (@i1), (@i2), (@i3), (@i4);
 insert into t1 values (@r1), (@r2);
 insert into t1 values (@s1), (@s2), (@s3), (@s4), (@s5);
 insert into t1 values (@n1);
-insert into t1 values (@n2); # not explicitely set before
+insert into t1 values (@n2); # not explicitly set before
 insert into t1 values (@a:=0), (@a:=@a+1), (@a:=@a+1);
 insert into t1 values (@a+(@b:=@a+1));
 set @q:='abc';

mysql-test/suite/rpl/t/rpl_user_variables.test

@@ -38,7 +38,7 @@ insert into t1 values (@i1), (@i2), (@i3), (@i4);
 insert into t1 values (@r1), (@r2);
 insert into t1 values (@s1), (@s2), (@s3), (@s4), (@s5);
 insert into t1 values (@n1);
-insert into t1 values (@n2); # not explicitely set before
+insert into t1 values (@n2); # not explicitly set before
 insert into t1 values (@a:=0), (@a:=@a+1), (@a:=@a+1);
 insert into t1 values (@a+(@b:=@a+1));
 set @q:='abc';

mysql-test/t/greedy_optimizer.test

@@ -138,7 +138,7 @@ insert into t7 values (21,2,3,4,5,6);
 # The actual test begins here
 #
 
-# Check the default values for the optimizer paramters
+# Check the default values for the optimizer parameters
 
 select @@optimizer_search_depth;
 select @@optimizer_prune_level;

mysql-test/t/mysqldump.test

@@ -174,7 +174,7 @@ drop database mysqldump_test_db;
 --echo # Check that we don't dump in UTF8 in compatible mode by default,
 --echo # but use the default compiled values, or the values given in
 --echo # --default-character-set=xxx. However, we should dump in UTF8
---echo # if it is explicitely set.
+--echo # if it is explicitly set.
 
 CREATE TABLE t1 (a  CHAR(10));
 INSERT INTO t1  VALUES (_latin1 '����');

mysys/ma_dyncol.c

@@ -2066,7 +2066,7 @@ static uchar *find_entry_named(DYN_HEADER *hdr, LEX_STRING *key)
 /**
   Write number in the buffer (backward direction - starts from the buffer end)
 
-  @return pointer on the number begining
+  @return pointer on the number beginning
 */
 
 static char *backwritenum(char *chr, uint numkey)

plugin/auth_gssapi/README.md

@@ -124,6 +124,6 @@ Send resulting GSSAPI blob to server.
 
 3. Server : receive blob from client, execute ```gss_accept_sec_context()/ AcceptSecurityContext()```, send resulting blob back to client
 
-4. Perform  2. and 3. can until both client and server decide that authentication is done, or until some error occured. If authentication was successful, GSSAPI context (an opaque structure) is generated on both client and server sides.
+4. Perform  2. and 3. can until both client and server decide that authentication is done, or until some error occurred. If authentication was successful, GSSAPI context (an opaque structure) is generated on both client and server sides.
 
 5. Server : Client name is extracted from the context, and compared to the name provided by client(with or without realm). If name matches, plugin returns success.

plugin/auth_pam/mapper/pam_user_map.c

@@ -15,7 +15,7 @@ auth            required        pam_user_map.so
   in the format:  orig_user_name: mapped_user_name
                   @user's_group_name: mapped_user_name
 =========================================================
-#comments and emtpy lines are ignored
+#comments and empty lines are ignored
 john: jack
 bob:  admin
 top:  accounting

plugin/aws_key_management/CMakeLists.txt

@@ -10,7 +10,7 @@
 
 
 # Give message why the building this plugin is skipped (only if -DVERBOSE is defined)
-# or if plugin is explicitely requested to build. Then bail out.
+# or if plugin is explicitly requested to build. Then bail out.
 MACRO(SKIP_AWS_PLUGIN msg)
   IF(VERBOSE OR "${PLUGIN_AWS_KEY_MANAGEMENT}" MATCHES "^(STATIC|DYNAMIC)$")
     MESSAGE(STATUS "Skip aws_key_management - ${msg}")

scripts/mysqlaccess.sh

@@ -262,7 +262,7 @@ Release Notes:
     * default values are read from a configuration file $script.conf
       first this file is looked for in the current directory; if not
       found it is looked for in @sysconfdir@
-      Note that when default-values are given, these can't get overriden
+      Note that when default-values are given, these can't get overridden
       by empty (blanc) values!
     * CGI-BIN version with HTML and forms interface.  Simply place the
       script in an ScriptAliased directory, make the configuration file

sql-common/client.c

@@ -1626,10 +1626,10 @@ mysql_init(MYSQL *mysql)
     How this change impacts existing apps:
     - existing apps which relyed on the default will see a behaviour change;
     they will have to set reconnect=1 after mysql_real_connect().
-    - existing apps which explicitely asked for reconnection (the only way they
+    - existing apps which explicitly asked for reconnection (the only way they
     could do it was by setting mysql.reconnect to 1 after mysql_real_connect())
     will not see a behaviour change.
-    - existing apps which explicitely asked for no reconnection
+    - existing apps which explicitly asked for no reconnection
     (mysql.reconnect=0) will not see a behaviour change.
   */
   mysql->reconnect= 0;

sql/handler.cc

@@ -2826,7 +2826,7 @@ void handler::adjust_next_insert_id_after_explicit_value(ulonglong nr)
 {
   /*
     If we have set THD::next_insert_id previously and plan to insert an
-    explicitely-specified value larger than this, we need to increase
+    explicitly-specified value larger than this, we need to increase
     THD::next_insert_id to be greater than the explicit value.
   */
   if ((next_insert_id > 0) && (nr >= next_insert_id))

sql/item_func.cc

@@ -4903,7 +4903,7 @@ Item_func_set_user_var::update_hash(void *ptr, uint length,
                                     bool unsigned_arg)
 {
   /*
-    If we set a variable explicitely to NULL then keep the old
+    If we set a variable explicitly to NULL then keep the old
     result type of the variable
   */
   if (args[0]->type() == Item::FIELD_ITEM)

sql/item_subselect.cc

@@ -2212,7 +2212,7 @@ Item_in_subselect::row_value_transformer(JOIN *join)
     /*
       The uncacheable property controls a number of actions, e.g. whether to
       save/restore (via init_save_join_tab/restore_tmp) the original JOIN for
-      plans with a temp table where the original JOIN was overriden by
+      plans with a temp table where the original JOIN was overridden by
       make_simple_join. The UNCACHEABLE_EXPLAIN is ignored by EXPLAIN, thus
       non-correlated subqueries will not appear as such to EXPLAIN.
     */
@@ -2508,7 +2508,7 @@ bool Item_in_subselect::create_in_to_exists_cond(JOIN *join_arg)
   /*
     The uncacheable property controls a number of actions, e.g. whether to
     save/restore (via init_save_join_tab/restore_tmp) the original JOIN for
-    plans with a temp table where the original JOIN was overriden by
+    plans with a temp table where the original JOIN was overridden by
     make_simple_join. The UNCACHEABLE_EXPLAIN is ignored by EXPLAIN, thus
     non-correlated subqueries will not appear as such to EXPLAIN.
   */
@@ -4622,7 +4622,7 @@ subselect_hash_sj_engine::choose_partial_match_strategy(
   /*
     Choose according to global optimizer switch. If only one of the switches is
     'ON', then the remaining strategy is the only possible one. The only cases
-    when this will be overriden is when the total size of all buffers for the
+    when this will be overridden is when the total size of all buffers for the
     merge strategy is bigger than the 'rowid_merge_buff_size' system variable,
     or if there isn't enough physical memory to allocate the buffers.
   */

sql/log.cc

@@ -4372,7 +4372,7 @@ int MYSQL_BIN_LOG::purge_first_log(Relay_log_info* rli, bool included)
 
   /*
    * Need to update the log pos because purge logs has been called 
-   * after fetching initially the log pos at the begining of the method.
+   * after fetching initially the log pos at the beginning of the method.
    */
   if((error=find_log_pos(&rli->linfo, rli->event_relay_log_name, 0)))
   {

sql/log_event.cc

@@ -8017,7 +8017,7 @@ void User_var_log_event::print(FILE* file, PRINT_EVENT_INFO* print_event_info)
         return;
       str_to_hex(hex_str, val, val_len);
       /*
-        For proper behaviour when mysqlbinlog|mysql, we need to explicitely
+        For proper behaviour when mysqlbinlog|mysql, we need to explicitly
         specify the variable's collation. It will however cause problems when
         people want to mysqlbinlog|mysql into another server not supporting the
         character set. But there's not much to do about this and it's unlikely.

sql/mysqld.cc

@@ -7207,7 +7207,7 @@ struct my_option my_long_options[]=
    GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   /*
     Because Sys_var_bit does not support command-line options, we need to
-    explicitely add one for --autocommit
+    explicitly add one for --autocommit
   */
   {"autocommit", 0, "Set default value for autocommit (0 or 1)",
    &opt_autocommit, &opt_autocommit, 0,

sql/opt_range.cc

@@ -13914,7 +13914,7 @@ int QUICK_GROUP_MIN_MAX_SELECT::next_max()
     SELECT [SUM|COUNT|AVG](DISTINCT a,...) FROM t
   This method comes to replace the index scan + Unique class 
   (distinct selection) for loose index scan that visits all the rows of a 
-  covering index instead of jumping in the begining of each group.
+  covering index instead of jumping in the beginning of each group.
   TODO: Placeholder function. To be replaced by a handler API call
 
   @param is_index_scan     hint to use index scan instead of random index read 

sql/parse_file.cc

@@ -660,7 +660,7 @@ parse_quoted_escaped_string(const char *ptr, const char *end,
 
   @param[in,out] ptr          pointer to parameter
   @param[in] end              end of the configuration
-  @param[in] line             pointer to the line begining
+  @param[in] line             pointer to the line beginning
   @param[in] base             base address for parameter writing (structure
     like TABLE)
   @param[in] parameter        description

sql/spatial.h

@@ -352,7 +352,7 @@ class Geometry
      Need to perform the calculation in logical units, since multiplication
      can overflow the size data type.
 
-     @arg data              pointer to the begining of the points array
+     @arg data              pointer to the beginning of the points array
      @arg expected_points   number of points expected
      @arg extra_point_space extra space for each point element in the array
      @return               true if there are not enough points

sql/sql_cache.cc

@@ -2360,7 +2360,7 @@ void Query_cache::invalidate(THD *thd, char *db)
           }
           /* 
             The used tables are linked in a circular list;
-            loop until we return to the begining.
+            loop until we return to the beginning.
           */
         } while (table_block != tables_blocks);
         /*
@@ -3301,7 +3301,7 @@ Query_cache::invalidate_query_block_list(THD *thd,
 }
 
 /*
-  Register given table list begining with given position in tables table of
+  Register given table list beginning with given position in tables table of
   block
 
   SYNOPSIS
@@ -4344,7 +4344,7 @@ my_bool Query_cache::move_by_type(uchar **border,
     {
       Query_cache_block_table *block_table = new_block->table(j);
 
-      // use aligment from begining of table if 'next' is in same block
+      // use aligment from beginning of table if 'next' is in same block
       if ((beg_of_table_table <= block_table->next) &&
 	  (block_table->next < end_of_table_table))
 	((Query_cache_block_table *)(beg_of_new_table_table + 
@@ -4354,7 +4354,7 @@ my_bool Query_cache::move_by_type(uchar **border,
       else
 	block_table->next->prev= block_table;
 
-      // use aligment from begining of table if 'prev' is in same block
+      // use aligment from beginning of table if 'prev' is in same block
       if ((beg_of_table_table <= block_table->prev) &&
 	  (block_table->prev < end_of_table_table))
 	((Query_cache_block_table *)(beg_of_new_table_table + 
@@ -4851,7 +4851,7 @@ my_bool Query_cache::check_integrity(bool locked)
       if (((uchar*)block) + block->length != ((uchar*)block->pnext))
       {
 	DBUG_PRINT("error", 
-		   ("block 0x%lx, type %u, ended at 0x%lx, but next block begining at 0x%lx",
+		   ("block 0x%lx, type %u, ended at 0x%lx, but next block beginning at 0x%lx",
 		    (ulong) block, (uint) block->type, 
 		    (ulong) (((uchar*)block) + block->length),
 		    (ulong) ((uchar*)block->pnext)));