Commit 422d11c2 authored by unknown's avatar unknown
Browse files

Remove unused thd->options's flag -- OPTION_UPDATE_LOG 

The update log itself was removed back in 5.0. Recommit
with post-review fixes.


sql/log.cc:
  OPTION_UPDATE_LOG was set in all threads but replication ones.
  So, it seems that the check filtered out slow log records from
  replication threads. Now we do it with explicit check.
sql/mysql_priv.h:
  remove unused define
sql/mysqld.cc:
  Do not set OPTION_UPDATE_LOG. It is not used anymore.
sql/set_var.cc:
  We never check for OPTION_UPDATE_LOG. So, we should not bother setting it.
parent 7e2a9aa4

sql/log.cc

+2 −1
Original line number Diff line number Diff line
@@ -714,7 +714,8 @@ bool LOGGER::slow_log_print(THD *thd, const char *query, uint query_length, 
  {

    current_time= time(NULL);



    if (!(thd->options & OPTION_UPDATE_LOG))

    /* do not log slow queries from replication threads */

    if (thd->slave_thread)

      return 0;



    lock();

sql/mysql_priv.h

+1 −2
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ extern CHARSET_INFO *national_charset_info, *table_alias_charset; 
#define OPTION_BIG_TABLES       (LL(1) << 8)       // THD, user

#define OPTION_BIG_SELECTS      (LL(1) << 9)       // THD, user

#define OPTION_LOG_OFF          (LL(1) << 10)      // THD, user

#define OPTION_UPDATE_LOG       (LL(1) << 11)      // THD, user, unused

#define OPTION_QUOTE_SHOW_CREATE (LL(1) << 11)     // THD, user

#define TMP_TABLE_ALL_COLUMNS   (LL(1) << 12)      // SELECT, intern

#define OPTION_WARNINGS         (LL(1) << 13)      // THD, user

#define OPTION_AUTO_IS_NULL     (LL(1) << 14)      // THD, user, binlog
@@ -271,7 +271,6 @@ extern CHARSET_INFO *national_charset_info, *table_alias_charset; 
#define OPTION_BEGIN            (LL(1) << 20)      // THD, intern

#define OPTION_TABLE_LOCK       (LL(1) << 21)      // THD, intern

#define OPTION_QUICK            (LL(1) << 22)      // SELECT (for DELETE)

#define OPTION_QUOTE_SHOW_CREATE (LL(1) << 23)     // THD, user



/* Thr following is used to detect a conflict with DISTINCT

   in the user query has requested */

sql/mysqld.cc

+2 −3
Original line number Diff line number Diff line
@@ -6982,9 +6982,8 @@ static void mysql_init_variables(void) 
  log_error_file_ptr= log_error_file;

  language_ptr= language;

  mysql_data_home= mysql_real_data_home;

  thd_startup_options= (OPTION_UPDATE_LOG | OPTION_AUTO_IS_NULL |

			OPTION_BIN_LOG | OPTION_QUOTE_SHOW_CREATE |

			OPTION_SQL_NOTES);

  thd_startup_options= (OPTION_AUTO_IS_NULL | OPTION_BIN_LOG |

                        OPTION_QUOTE_SHOW_CREATE | OPTION_SQL_NOTES);

  protocol_version= PROTOCOL_VERSION;

  what_to_log= ~ (1L << (uint) COM_TIME);

  refresh_version= flush_version= 1L;	/* Increments on each reload */

sql/set_var.cc

+7 −18
Original line number Diff line number Diff line
@@ -22,9 +22,6 @@ 
  - Use one of the 'sys_var... classes from set_var.h or write a specific

    one for the variable type.

  - Define it in the 'variable definition list' in this file.

  - If the variable should be changeable or one should be able to access it

    with @@variable_name, it should be added to the 'list of all variables'

    list (sys_variables) in this file.

  - If the variable is thread specific, add it to 'system_variables' struct.

    If not, add it to mysqld.cc and an declaration in 'mysql_priv.h'

  - If the variable should be changed from the command line, add a definition
@@ -140,7 +137,6 @@ static bool set_option_autocommit(THD *thd, set_var *var); 
static int  check_log_update(THD *thd, set_var *var);

static bool set_log_update(THD *thd, set_var *var);

static int  check_pseudo_thread_id(THD *thd, set_var *var);

static bool set_log_bin(THD *thd, set_var *var);

void fix_binlog_format_after_update(THD *thd, enum_var_type type);

static void fix_low_priority_updates(THD *thd, enum_var_type type);

static int check_tx_isolation(THD *thd, set_var *var);
@@ -170,7 +166,10 @@ static byte *get_warning_count(THD *thd); 
  Variable definition list



  These are variables that can be set from the command line, in

  alphabetic order

  alphabetic order.



  The variables are linked into the list. A variable is added to

  it in the constructor (see sys_var class for details).

*/



sys_var *sys_var::first= NULL;
@@ -557,10 +556,10 @@ static sys_var_thd_bit sys_log_off("sql_log_off", 0, 
static sys_var_thd_bit	sys_log_update("sql_log_update",

                                       check_log_update,

				       set_log_update,

				       OPTION_UPDATE_LOG);

				       OPTION_BIN_LOG);

static sys_var_thd_bit	sys_log_binlog("sql_log_bin",

                                       check_log_update,

				       set_log_bin,

				       set_option_bit,

				       OPTION_BIN_LOG);

static sys_var_thd_bit	sys_sql_warnings("sql_warnings", 0,

					 set_option_bit,
@@ -2778,8 +2777,6 @@ static bool set_log_update(THD *thd, set_var *var) 


  if (opt_sql_bin_update)

  {

    ((sys_var_thd_bit*) var->var)->bit_flag|= (OPTION_BIN_LOG |

					       OPTION_UPDATE_LOG);

    push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,

                 ER_UPDATE_LOG_DEPRECATED_TRANSLATED,

                 ER(ER_UPDATE_LOG_DEPRECATED_TRANSLATED));
@@ -2792,14 +2789,6 @@ static bool set_log_update(THD *thd, set_var *var) 
  return 0;

}



static bool set_log_bin(THD *thd, set_var *var)

{

  if (opt_sql_bin_update)

    ((sys_var_thd_bit*) var->var)->bit_flag|= (OPTION_BIN_LOG |

					       OPTION_UPDATE_LOG);

  set_option_bit(thd, var);

  return 0;

}



static int check_pseudo_thread_id(THD *thd, set_var *var)

{