SQL: followup misc rename on versioning

vers_sys_type_t -> vers_kind_t

4 files changed, 12 insertions, 12 deletions

diff --git a/sql/sql_type.h b/sql/sql_type.h
index 70b1ab39da2..ea745d468f4 100644
--- a/sql/sql_type.h
+++ b/sql/sql_type.h
@@ -3238,7 +3238,7 @@ public:
 };
 
 
-enum vers_sys_type_t
+enum vers_kind_t
 {
   VERS_UNDEFINED= 0,
   VERS_TIMESTAMP,
@@ -3252,7 +3252,7 @@ protected:
   Vers_type_handler() {}
 public:
   virtual ~Vers_type_handler() {}
-  virtual vers_sys_type_t kind() const
+  virtual vers_kind_t kind() const
   {
     DBUG_ASSERT(0);
     return VERS_UNDEFINED;
@@ -3266,7 +3266,7 @@ public:
 class Vers_type_timestamp: public Vers_type_handler
 {
 public:
-  virtual vers_sys_type_t kind() const
+  virtual vers_kind_t kind() const
   {
     return VERS_TIMESTAMP;
   }
@@ -3280,7 +3280,7 @@ extern MYSQL_PLUGIN_IMPORT Vers_type_timestamp vers_type_timestamp;
 class Vers_type_trx: public Vers_type_handler
 {
 public:
-  virtual vers_sys_type_t kind() const
+  virtual vers_kind_t kind() const
   {
     return VERS_TRX_ID;
   }
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index bc3a3d8cd39..39d8ab530c2 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -814,7 +814,7 @@ Virtual_column_info *add_virtual_expression(THD *thd, Item *expr)
   enum Window_frame::Frame_exclusion frame_exclusion;
   enum trigger_order_type trigger_action_order_type;
   DDL_options_st object_ddl_options;
-  enum vers_sys_type_t vers_range_unit;
+  enum vers_kind_t vers_range_unit;
   enum Column_definition::enum_column_versioning vers_column_versioning;
   enum plsql_cursor_attr_t plsql_cursor_attr;
 }
diff --git a/sql/sql_yacc_ora.yy b/sql/sql_yacc_ora.yy
index f3dc8614430..8768cc1270b 100644
--- a/sql/sql_yacc_ora.yy
+++ b/sql/sql_yacc_ora.yy
@@ -281,7 +281,7 @@ void ORAerror(THD *thd, const char *s)
   enum Window_frame::Frame_exclusion frame_exclusion;
   enum trigger_order_type trigger_action_order_type;
   DDL_options_st object_ddl_options;
-  enum vers_sys_type_t vers_range_unit;
+  enum vers_kind_t vers_range_unit;
   enum Column_definition::enum_column_versioning vers_column_versioning;
   enum plsql_cursor_attr_t plsql_cursor_attr;
 }
diff --git a/sql/table.h b/sql/table.h
index 7a571d94424..898c31c4aff 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -32,7 +32,7 @@
 #include "filesort_utils.h"
 #include "parse_file.h"
 #include "sql_i_s.h"
-#include "sql_type.h"               /* vers_sys_type_t */
+#include "sql_type.h"               /* vers_kind_t */
 
 /* Structs that defines the TABLE */
 
@@ -809,7 +809,7 @@ struct TABLE_SHARE
     }
   };
 
-  vers_sys_type_t versioned;
+  vers_kind_t versioned;
   period_info_t vers;
   period_info_t period;
 
@@ -1582,14 +1582,14 @@ public:
     return s->versioned;
   }
 
-  bool versioned(vers_sys_type_t type) const
+  bool versioned(vers_kind_t type) const
   {
     DBUG_ASSERT(s);
     DBUG_ASSERT(type);
     return s->versioned == type;
   }
 
-  bool versioned_write(vers_sys_type_t type= VERS_UNDEFINED) const
+  bool versioned_write(vers_kind_t type= VERS_UNDEFINED) const
   {
     DBUG_ASSERT(versioned() || !vers_write);
     return versioned(type) ? vers_write : false;
@@ -1820,7 +1820,7 @@ class Item_in_subselect;
 /* trivial class, for %union in sql_yacc.yy */
 struct vers_history_point_t
 {
-  vers_sys_type_t unit;
+  vers_kind_t unit;
   Item *item;
 };
 
@@ -1830,7 +1830,7 @@ class Vers_history_point : public vers_history_point_t
 
 public:
   Vers_history_point() { empty(); }
-  Vers_history_point(vers_sys_type_t unit_arg, Item *item_arg)
+  Vers_history_point(vers_kind_t unit_arg, Item *item_arg)
   {
     unit= unit_arg;
     item= item_arg;