database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

SQL: followup misc rename on versioning

Browse Source 
vers_sys_type_t -> vers_kind_t
This commit is contained in:
Aleksey Midenkov
2018-09-18 14:20:09 +03:00
parent 58fdf5b2fa
commit 19b5b17773
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_type.h
View File

@ -3238,7 +3238,7 @@ public:
}; };
enum vers_sys_type_t enum vers_kind_t
{ {
VERS_UNDEFINED= 0, VERS_UNDEFINED= 0,
VERS_TIMESTAMP, VERS_TIMESTAMP,
@ -3252,7 +3252,7 @@ protected:
Vers_type_handler() {} Vers_type_handler() {}
public: public:
virtual ~Vers_type_handler() {} virtual ~Vers_type_handler() {}
virtual vers_sys_type_t kind() const virtual vers_kind_t kind() const
{ {
DBUG_ASSERT(0); DBUG_ASSERT(0);
return VERS_UNDEFINED; return VERS_UNDEFINED;
@ -3266,7 +3266,7 @@ public:
class Vers_type_timestamp: public Vers_type_handler class Vers_type_timestamp: public Vers_type_handler
{ {
public: public:
virtual vers_sys_type_t kind() const virtual vers_kind_t kind() const
{ {
return VERS_TIMESTAMP; 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 class Vers_type_trx: public Vers_type_handler
{ {
public: public:
virtual vers_sys_type_t kind() const virtual vers_kind_t kind() const
{ {
return VERS_TRX_ID; return VERS_TRX_ID;
} }

2
sql/sql_yacc.yy
View File

@ -814,7 +814,7 @@ Virtual_column_info *add_virtual_expression(THD *thd, Item *expr)
enum Window_frame::Frame_exclusion frame_exclusion; enum Window_frame::Frame_exclusion frame_exclusion;
enum trigger_order_type trigger_action_order_type; enum trigger_order_type trigger_action_order_type;
DDL_options_st object_ddl_options; 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 Column_definition::enum_column_versioning vers_column_versioning;
enum plsql_cursor_attr_t plsql_cursor_attr; enum plsql_cursor_attr_t plsql_cursor_attr;
} }

2
sql/sql_yacc_ora.yy
View File

@ -281,7 +281,7 @@ void ORAerror(THD *thd, const char *s)
enum Window_frame::Frame_exclusion frame_exclusion; enum Window_frame::Frame_exclusion frame_exclusion;
enum trigger_order_type trigger_action_order_type; enum trigger_order_type trigger_action_order_type;
DDL_options_st object_ddl_options; 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 Column_definition::enum_column_versioning vers_column_versioning;
enum plsql_cursor_attr_t plsql_cursor_attr; enum plsql_cursor_attr_t plsql_cursor_attr;
} }

12
sql/table.h
View File

@ -32,7 +32,7 @@
#include "filesort_utils.h" #include "filesort_utils.h"
#include "parse_file.h" #include "parse_file.h"
#include "sql_i_s.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 */ /* 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 vers;
period_info_t period; period_info_t period;
@ -1582,14 +1582,14 @@ public:
return s->versioned; return s->versioned;
} }
bool versioned(vers_sys_type_t type) const bool versioned(vers_kind_t type) const
{ {
DBUG_ASSERT(s); DBUG_ASSERT(s);
DBUG_ASSERT(type); DBUG_ASSERT(type);
return s->versioned == 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); DBUG_ASSERT(versioned() || !vers_write);
return versioned(type) ? vers_write : false; return versioned(type) ? vers_write : false;
@ -1820,7 +1820,7 @@ class Item_in_subselect;
/* trivial class, for %union in sql_yacc.yy */ /* trivial class, for %union in sql_yacc.yy */
struct vers_history_point_t struct vers_history_point_t
{ {
vers_sys_type_t unit; vers_kind_t unit;
Item *item; Item *item;
}; };
@ -1830,7 +1830,7 @@ class Vers_history_point : public vers_history_point_t
public: public:
Vers_history_point() { empty(); } 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; unit= unit_arg;
item= item_arg; item= item_arg;