SQL, IB: various refactoring [#337]

Author: kevgs

include/mysql_com.h

@@ -198,7 +198,7 @@ enum enum_indicator_type
 #define VERS_SYS_END_FLAG (1 << 28) /* autogenerated column declared with
  `generated always as row end`
  (see II.a SQL Standard).*/
-#define VERS_OPTIMIZED_UPDATE_FLAG (1 << 29) /* column that doesn't support
+#define VERS_UPDATE_UNVERSIONED_FLAG (1 << 29) /* column that doesn't support
  system versioning when table
  itself supports it*/
 #define HIDDEN_FLAG (1 << 31) /* hide from SELECT * */

sql/field.h

@@ -1455,6 +1455,11 @@ class Field: public Value_source
  return flags & (VERS_SYS_START_FLAG | VERS_SYS_END_FLAG);
  }
 
+ bool vers_update_unversioned() const
+ {
+ return flags & VERS_UPDATE_UNVERSIONED_FLAG;
+ }
+
  virtual bool vers_trx_id() const
  {
  return false;

sql/handler.cc

@@ -6859,7 +6859,7 @@ bool Vers_parse_info::check_and_fix_implicit(
  !with_system_versioning) ||
  f->versioning == Column_definition::WITHOUT_VERSIONING)
  {
- f->flags|= VERS_OPTIMIZED_UPDATE_FLAG;
+ f->flags|= VERS_UPDATE_UNVERSIONED_FLAG;
  }
  }
 
@@ -6999,7 +6999,7 @@ bool Vers_parse_info::check_and_fix_alter(THD *thd, Alter_info *alter_info,
  while (Create_field *f= it++)
  {
  if (f->versioning == Column_definition::WITHOUT_VERSIONING)
- f->flags|= VERS_OPTIMIZED_UPDATE_FLAG;
+ f->flags|= VERS_UPDATE_UNVERSIONED_FLAG;
 
  if (f->change.str && (start == f->change || end == f->change))
  {

sql/item.cc

@@ -10384,7 +10384,7 @@ Item *Item_field::vers_optimized_fields_transformer(THD *thd, uchar *)
  if (!field)
  return this;
 
- if (field->flags & VERS_OPTIMIZED_UPDATE_FLAG && context &&
+ if (field->vers_update_unversioned() && context &&
  field->table->pos_in_table_list &&
  field->table->pos_in_table_list->vers_conditions)
  {

sql/sql_class.cc

@@ -710,12 +710,6 @@ extern "C" void thd_kill_timeout(THD* thd)
  mysql_mutex_unlock(&thd->LOCK_thd_data);
 }
 
-Time_zone * thd_get_timezone(THD * thd)
-{
-DBUG_ASSERT(thd && thd->variables.time_zone);
-return thd->variables.time_zone;
-}
-
 void thd_vers_update_trt(THD * thd, bool value)
 {
  thd->vers_update_trt= value;

sql/sql_class.h

@@ -155,6 +155,7 @@ extern bool volatile shutdown_in_progress;
 
 extern "C" LEX_STRING * thd_query_string (MYSQL_THD thd);
 extern "C" size_t thd_query_safe(MYSQL_THD thd, char *buf, size_t buflen);
+void thd_vers_update_trt(THD *thd, bool value);
 
 /**
  @class CSET_STRING
@@ -4564,6 +4565,8 @@ class THD :public Statement,
  /* Handling of timeouts for commands */
  thr_timer_t query_timer;
 
+ // Storage engine may set this to true is we want to write a row to
+ // transaction_registry table on transaction commit.
  bool vers_update_trt;
 
 public:

sql/sql_select.cc

@@ -16743,7 +16743,7 @@ Field *create_tmp_field_from_field(THD *thd, Field *org_field,
  HIDDEN_FLAG |
  VERS_SYS_START_FLAG |
  VERS_SYS_END_FLAG |
- VERS_OPTIMIZED_UPDATE_FLAG));
+ VERS_UPDATE_UNVERSIONED_FLAG));
  if (org_field->maybe_null() || (item && item->maybe_null))
  new_field->flags&= ~NOT_NULL_FLAG;	// Because of outer join
  if (org_field->type() == MYSQL_TYPE_VAR_STRING ||

sql/sql_show.cc

@@ -2188,7 +2188,7 @@ int show_create_table(THD *thd, TABLE_LIST *table_list, String *packet,
  packet->append(def_value.ptr(), def_value.length(), system_charset_info);
  }
 
- if (field->flags & VERS_OPTIMIZED_UPDATE_FLAG)
+ if (field->vers_update_unversioned())
  {
  packet->append(STRING_WITH_LEN(" WITHOUT SYSTEM VERSIONING"));
  }

sql/sql_update.cc

@@ -161,7 +161,7 @@ static bool check_has_vers_fields(List<Item> &items)
  while (Item *item= it++)
  {
  if (Item_field *item_field= item->field_for_view_update())
- if (!(item_field->field->flags & VERS_OPTIMIZED_UPDATE_FLAG))
+ if (!item_field->field->vers_update_unversioned())
  return true;
  }
  return false;

sql/table.cc

@@ -2051,7 +2051,7 @@ int TABLE_SHARE::init_from_binary_frm_image(THD *thd, bool write,
  {
  uchar flags= *extra2_field_flags++;
  if (flags & VERS_OPTIMIZED_UPDATE)
- reg_field->flags|= VERS_OPTIMIZED_UPDATE_FLAG;
+ reg_field->flags|= VERS_UPDATE_UNVERSIONED_FLAG;
  if (flags & HIDDEN)
  reg_field->flags|= HIDDEN_FLAG;
  }
@@ -8527,7 +8527,8 @@ void TR_table::store(uint field_id, timeval ts)
 
 void TR_table::store_data(ulonglong trx_id, ulonglong commit_id, timeval commit_ts)
 {
- timeval start_time= {thd->start_time, thd->start_time_sec_part};
+ timeval start_time= {static_cast<int>(thd->start_time),
+ static_cast<int>(thd->start_time_sec_part)};
  store(FLD_TRX_ID, trx_id);
  store(FLD_COMMIT_ID, commit_id);
  store(FLD_BEGIN_TS, start_time);