MDEV-6153 Trivial Lintian errors in MariaDB sources: spelling errors and wrong executable bits

14 files changed, 18 insertions, 18 deletions

diff --git a/sql/handler.h b/sql/handler.h
index 49e18facdb7..5bba570f8ec 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -1610,7 +1610,7 @@ struct HA_CREATE_INFO
     For ALTER TABLE defaults to ROW_TYPE_NOT_USED (means "keep the current").
 
     Can be changed either explicitly by the parser.
-    If nothing speficied inherits the value of the original table (if present).
+    If nothing specified inherits the value of the original table (if present).
   */
   enum row_type row_type;
   enum ha_choice transactional;
diff --git a/sql/item_xmlfunc.cc b/sql/item_xmlfunc.cc
index 30db7e635e2..759b929ff82 100644
--- a/sql/item_xmlfunc.cc
+++ b/sql/item_xmlfunc.cc
@@ -2899,7 +2899,7 @@ bool Item_func_xml_update::collect_result(String *str,
   str->length(0);
   str->set_charset(collation.collation);
   return
-    /* Put the XML part preceeding the replaced piece */
+    /* Put the XML part preceding the replaced piece */
     str->append(xml.raw()->ptr(), cut->beg - xml.raw()->ptr() - offs) ||
     /* Put the replacement */
     str->append(replace->ptr(), replace->length()) ||
diff --git a/sql/log_event.cc b/sql/log_event.cc
index f5dfbe221aa..9846bade696 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -4087,7 +4087,7 @@ int Query_log_event::do_apply_event(rpl_group_info *rgi,
     if ((error= rows_event_stmt_cleanup(rgi, thd)))
     {
       const_cast<Relay_log_info*>(rli)->report(ERROR_LEVEL, error,
-                  "Error in cleaning up after an event preceeding the commit; "
+                  "Error in cleaning up after an event preceding the commit; "
                   "the group log file/position: %s %s",
                   const_cast<Relay_log_info*>(rli)->group_master_log_name,
                   llstr(const_cast<Relay_log_info*>(rli)->group_master_log_pos,
diff --git a/sql/log_event.h b/sql/log_event.h
index 020af59ae81..2091d968558 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -2004,7 +2004,7 @@ public:
   bool is_valid() const { return query != 0; }
 
   /*
-    Returns number of bytes additionaly written to post header by derived
+    Returns number of bytes additionally written to post header by derived
     events (so far it is only Execute_load_query event).
   */
   virtual ulong get_post_header_size_for_derived() { return 0; }
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index d86a1743468..90d6659cdcf 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -7097,7 +7097,7 @@ struct my_option my_long_options[]=
    GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"plugin-load-add", OPT_PLUGIN_LOAD_ADD,
    "Optional semicolon-separated list of plugins to load. This option adds "
-   "to the list speficied by --plugin-load in an incremental way. "
+   "to the list specified by --plugin-load in an incremental way. "
    "It can be specified many times, adding more plugins every time.",
    0, 0, 0,
     GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
diff --git a/sql/password.c b/sql/password.c
index 7a3d8aafde3..37d06136d80 100644
--- a/sql/password.c
+++ b/sql/password.c
@@ -442,7 +442,7 @@ void make_scrambled_password(char *to, const char *password)
 
 /*
     Produce an obscure octet sequence from password and random
-    string, recieved from the server. This sequence corresponds to the
+    string, received from the server. This sequence corresponds to the
     password, but password can not be easily restored from it. The sequence
     is then sent to the server for validation. Trailing zero is not stored
     in the buf as it is not needed.
@@ -476,7 +476,7 @@ scramble(char *to, const char *message, const char *password)
 
 /*
     Check that scrambled message corresponds to the password; the function
-    is used by server to check that recieved reply is authentic.
+    is used by server to check that received reply is authentic.
     This function does not check lengths of given strings: message must be
     null-terminated, reply and hash_stage2 must be at least SHA1_HASH_SIZE
     long (if not, something fishy is going on).
diff --git a/sql/rpl_utility.cc b/sql/rpl_utility.cc
index fcb6a849fb1..05227a29775 100644
--- a/sql/rpl_utility.cc
+++ b/sql/rpl_utility.cc
@@ -1229,7 +1229,7 @@ bool Deferred_log_events::execute(rpl_group_info *rgi)
 void Deferred_log_events::rewind()
 {
   /*
-    Reset preceeding Query log event events which execution was
+    Reset preceding Query log event events which execution was
     deferred because of slave side filtering.
   */
   if (!is_empty())
diff --git a/sql/slave.cc b/sql/slave.cc
index a40e5735b24..f7d019a6c39 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -4427,7 +4427,7 @@ pthread_handler_t handle_slave_sql(void *arg)
 
   /*
     binlog_annotate_row_events must be TRUE only after an Annotate_rows event
-    has been recieved and only till the last corresponding rbr event has been
+    has been received and only till the last corresponding rbr event has been
     applied. In all other cases it must be FALSE.
   */
   thd->variables.binlog_annotate_row_events= 0;
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc
index 1c4449ef7c2..433f3303ad7 100644
--- a/sql/sql_connect.cc
+++ b/sql/sql_connect.cc
@@ -715,7 +715,7 @@ static void update_global_user_stats_with_user(THD *thd,
   user_stats->cpu_time+=   (thd->status_var.cpu_time -
                             thd->org_status_var.cpu_time); 
   /*
-    This is handle specially as bytes_recieved is incremented BEFORE
+    This is handle specially as bytes_received is incremented BEFORE
     org_status_var is copied.
   */
   user_stats->bytes_received+= (thd->org_status_var.bytes_received-
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index 6ca4015adb4..ebceae70ee5 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -74,7 +74,7 @@ When one supplies long data for a placeholder:
 
   - Server gets the long data in pieces with command type
     'COM_STMT_SEND_LONG_DATA'.
-  - The packet recieved will have the format as:
+  - The packet received will have the format as:
     [COM_STMT_SEND_LONG_DATA:1][STMT_ID:4][parameter_number:2][data]
   - data from the packet is appended to the long data value buffer for this
     placeholder.
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index b97cedb5b05..b88aed1f1bb 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -21094,7 +21094,7 @@ find_order_in_list(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables,
     Item *view_ref= NULL;
     /*
       If we have found field not by its alias in select list but by its
-      original field name, we should additionaly check if we have conflict
+      original field name, we should additionally check if we have conflict
       for this name (in case if we would perform lookup in all tables).
     */
     if (resolution == RESOLVED_BEHIND_ALIAS && !order_item->fixed &&
@@ -22117,7 +22117,7 @@ change_to_use_tmp_fields(THD *thd, Item **ref_pointer_array,
          We are replacing the argument of Item_func_set_user_var after its value
          has been read.  The argument's null_value should be set by now, so we
          must set it explicitly for the replacement argument since the null_value
-         may be read without any preceeding call to val_*().
+         may be read without any preceding call to val_*().
         */
         new_field->update_null_value();
         List<Item> list;
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 9ea72676b13..d6b3fa41c78 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -14535,7 +14535,7 @@ opt_var_ident_type:
         | SESSION_SYM '.' { $$=OPT_SESSION; }
         ;
 
-// Option values with preceeding option_type.
+// Option values with preceding option_type.
 option_value_following_option_type:
           internal_variable_name equal set_expr_or_default
           {
@@ -14551,7 +14551,7 @@ option_value_following_option_type:
             {
               /*
                 Not in trigger assigning value to new row,
-                and option_type preceeding local variable is illegal.
+                and option_type preceding local variable is illegal.
               */
               my_parse_error(ER(ER_SYNTAX_ERROR));
               MYSQL_YYABORT;
@@ -14559,7 +14559,7 @@ option_value_following_option_type:
           }
         ;
 
-// Option values without preceeding option_type.
+// Option values without preceding option_type.
 option_value_no_option_type:
           internal_variable_name equal set_expr_or_default
           {
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index b772c82ef52..bb4b7f6da01 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -4664,7 +4664,7 @@ static Sys_var_mybool Sys_binlog_annotate_row_events(
 #ifdef HAVE_REPLICATION
 static Sys_var_mybool Sys_replicate_annotate_row_events(
        "replicate_annotate_row_events",
-       "Tells the slave to write annotate rows events recieved from the master "
+       "Tells the slave to write annotate rows events received from the master "
        "to its own binary log. Ignored if log_slave_updates is not set",
        READ_ONLY GLOBAL_VAR(opt_replicate_annotate_row_events),
        CMD_LINE(OPT_ARG), DEFAULT(0));
diff --git a/sql/tztime.cc b/sql/tztime.cc
index b0c5a0830fc..d3b4fec6335 100644
--- a/sql/tztime.cc
+++ b/sql/tztime.cc
@@ -2033,7 +2033,7 @@ tz_load_from_open_tables(const String *tz_name, TABLE_LIST *tz_tables)
 
   /*
     At last we are doing the same thing for records in
-    mysql.time_zone_transition table. Here we additionaly need records
+    mysql.time_zone_transition table. Here we additionally need records
     in ascending order by index scan also satisfies us.
   */
   table= tz_tables->table;