Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
19b5b177
Commit
19b5b177
authored
Sep 18, 2018
by
Aleksey Midenkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SQL: followup misc rename on versioning
vers_sys_type_t -> vers_kind_t
parent
58fdf5b2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
12 deletions
+12
-12
sql/sql_type.h
sql/sql_type.h
+4
-4
sql/sql_yacc.yy
sql/sql_yacc.yy
+1
-1
sql/sql_yacc_ora.yy
sql/sql_yacc_ora.yy
+1
-1
sql/table.h
sql/table.h
+6
-6
No files found.
sql/sql_type.h
View file @
19b5b177
...
...
@@ -3238,7 +3238,7 @@ class Information_schema_character_attributes
};
enum
vers_
sys_type
_t
enum
vers_
kind
_t
{
VERS_UNDEFINED
=
0
,
VERS_TIMESTAMP
,
...
...
@@ -3252,7 +3252,7 @@ class Vers_type_handler
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 @@ class Vers_type_handler
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
;
}
...
...
sql/sql_yacc.yy
View file @
19b5b177
...
...
@@ -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;
}
...
...
sql/sql_yacc_ora.yy
View file @
19b5b177
...
...
@@ -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;
}
...
...
sql/table.h
View file @
19b5b177
...
...
@@ -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 @@ struct TABLE
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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment