Corrections to parent "fix typos" commmit

sql/ddl_log.cc

@@ -876,7 +876,7 @@ static bool ddl_log_increment_phase_no_lock(uint entry_pos)
     else
     {
       /*
-        Trying to deactivate an execute entry or already deactive entry.
+        Trying to deactivate an execute entry or already inactive entry.
         This should not happen
       */
       DBUG_ASSERT(0);
@@ -1017,7 +1017,7 @@ static void ddl_log_to_binary_log(THD *thd, String *query)
      table name to the query
 
    When we log, we always log all found tables and views at the same time. This
-   is done to simply execute the code as otherwise we would have to keep
+   is done to simplify the execute code as otherwise we would have to keep
    information of what was logged.
 */
 

sql/gcalc_slicescan.h

@@ -414,7 +414,7 @@ public:
   };
 
   /* That class introduced mostly for the 'typecontrol' reason.      */
-  /* only difference from the point classes is the get_next() function. */
+  /* only difference from the point class is the get_next() function. */
   class event_point : public point
   {
   public:

sql/handler.h

@@ -2644,7 +2644,7 @@ public:
   */
   alter_table_operations handler_flags= 0;
 
-  /* Alter operations involving partitons are stored here */
+  /* Alter operations involving partitions are stored here */
   ulong partition_flags;
 
   /**
@@ -5491,7 +5491,7 @@ public:
     @param record        record to find (also will be fillded with
                          actual record fields)
     @param unique_ref    index or unique constraint number (depends
-                         on what was used in the engine
+                         on how it is implemented by the engine)
 
     @retval -1 Error
     @retval  1 Not found

sql/my_json_writer.h

@@ -76,7 +76,7 @@ class Single_line_formatting_helper
   };
 
   /*
-    This works like a finite automation.
+    This works like a finite automaton.
 
     state=DISABLED means the helper is disabled - all on_XXX functions will
     return false (which means "not handled") and do nothing.

sql/mysqld.cc

@@ -5749,7 +5749,7 @@ static void run_main_loop()
 int mysqld_main(int argc, char **argv)
 {
 #ifndef _WIN32
-  /* We can't close stdin just now, because it may be in bootstrap mode. */
+  /* We can't close stdin until we know we're not in bootstrap mode. */
   bool please_close_stdin= fcntl(STDIN_FILENO, F_GETFD) >= 0;
 #endif
 

sql/rpl_rli.cc

@@ -1073,7 +1073,7 @@ void Relay_log_info::inc_group_relay_log_pos(ulonglong log_pos,
     value which would lead to badly broken replication.
     Even the relay_log_pos will be corrupted in this case, because the len is
     the relay log is not "val".
-    With the end_log_pos solution, we avoid computations involving length.
+    With the end_log_pos solution, we avoid computations involving lengthes.
   */
   mysql_cond_broadcast(&data_cond);
   if (!skip_lock)

sql/slave.cc

@@ -1049,7 +1049,7 @@ terminate_slave_thread(THD *thd,
 
   /*
     Is is critical to test if the slave is running. Otherwise, we might
-    be refreeing freed memory trying to kick it
+    be referencing freed memory trying to kick it
   */
 
   while (*slave_running)                        // Should always be true
@@ -4096,7 +4096,7 @@ static int exec_relay_log_event(THD* thd, Relay_log_info* rli,
          The following failure injecion works in cooperation with tests 
          setting @@global.debug= 'd,incomplete_group_in_relay_log'.
          Xid or Commit events are not executed to force the slave sql
-         read hanging if the real log does not have any more events.
+         read hanging if the relay log does not have any more events.
       */
       DBUG_EXECUTE_IF("incomplete_group_in_relay_log",
                       if ((typ == XID_EVENT) ||
@@ -6143,7 +6143,7 @@ static int queue_event(Master_info* mi, const uchar *buf, ulong event_len)
 
        Slave can have lower coordinates, if some event from master was omitted.
 
-       TODO: handling `when' for SHOW SLAVE STATUS' sends behind
+       TODO: handling `when' for SHOW SLAVE STATUS' seconds behind
     */
     if (memcmp(mi->master_log_name, hb.get_log_ident(), hb.get_ident_len()) ||
         mi->master_log_pos > hb.log_pos) {

sql/socketpair.c

@@ -26,7 +26,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /* Changes:
- * 2023-12-25 Adopted for MariaDB usage
+ * 2023-12-25 Adapted for MariaDB usage
  * 2014-02-12: merge David Woodhouse, Ger Hobbelt improvements
  *     git.infradead.org/users/dwmw2/openconnect.git/commitdiff/bdeefa54
  *     github.com/GerHobbelt/selectable-socketpair

sql/sql_cache.cc

@@ -296,7 +296,7 @@ functions:
          cache block by block.
  6. Query_cache::resize
        - Used to change the available memory used by the query cache. This
-         will also invalidate the entries query cache in one free operation.
+         will also invalidate the entire query cache in one free operation.
  7. Query_cache::pack
        - Used when a FLUSH QUERY CACHE is issued. This changes the order of
          the used memory blocks in physical memory order and move all avail-

sql/sql_class.cc

@@ -5831,7 +5831,7 @@ extern "C" bool thd_binlog_filter_ok(const MYSQL_THD thd)
 }
 
 /*
-  This is similar to sqlcom_can_generate_row_events, with the expectation
+  This is similar to sqlcom_can_generate_row_events, with the exception
   that we only return 1 if we are going to generate row events in a
   transaction.
   CREATE OR REPLACE is always safe to do as this will run in it's own

sql/sql_lex.cc

@@ -8979,9 +8979,9 @@ uint binlog_unsafe_map[256];
   Sets the combination given by "a" and "b" and automatically combinations
   given by other types of access, i.e. 2^(8 - 2), as unsafe.
 
-  It may make a collision when automatically defining a combination as unsafe.
+  Collision may happen when a combination is marked unsafe automatically.
   For that reason, a combination has its unsafe condition redefined only when
-  the new_condition is greater then the old. For instance,
+  the new_condition is greater than the old. For instance,
   
      . (BINLOG_DIRECT_ON & TRX_CACHE_NOT_EMPTY) is never overwritten by 
      . (BINLOG_DIRECT_ON | BINLOG_DIRECT_OFF).

sql/sql_type.cc

@@ -5241,7 +5241,7 @@ bool Type_handler_int_result::Item_val_bool(Item *item) const
     and we need to evaluate the boolean value from the integer value
     as a fall-back method. To avoid the assert, let's hide the IS_COND flag.
     Eventually we'll need to implement val_bool() in all Item descendants and
-    remove the trick with flags. This change would be too tricky for 10.6.
+    remove the trick with flags. This change would be too risky for 10.6.
     Let's do it in a later version.
   */
   item_base_t flags= item->base_flags;