Commit a03da4fa authored by Kosov Eugene's avatar Kosov Eugene Committed by Aleksey Midenkov

Style: removed unused header, other small fixes

parent 2edb6fda
...@@ -33,8 +33,6 @@ ...@@ -33,8 +33,6 @@
#include "compat56.h" #include "compat56.h"
#include "sql_type.h" /* Type_std_attributes */ #include "sql_type.h" /* Type_std_attributes */
#include <limits>
class Send_field; class Send_field;
class Copy_field; class Copy_field;
class Protocol; class Protocol;
......
...@@ -6559,9 +6559,9 @@ static bool create_string(MEM_ROOT *mem_root, String **s, const char *value) ...@@ -6559,9 +6559,9 @@ static bool create_string(MEM_ROOT *mem_root, String **s, const char *value)
return *s == NULL; return *s == NULL;
} }
static bool create_sys_trx_field_if_missing(THD *thd, const char *field_name, static bool create_sys_trx_field(THD *thd, const char *field_name,
Alter_info *alter_info, String **s, Alter_info *alter_info, String **s,
bool integer_fields) bool integer_fields)
{ {
Create_field *f= new (thd->mem_root) Create_field(); Create_field *f= new (thd->mem_root) Create_field();
if (!f) if (!f)
...@@ -6626,10 +6626,10 @@ bool Vers_parse_info::add_versioning_info( ...@@ -6626,10 +6626,10 @@ bool Vers_parse_info::add_versioning_info(
period_for_system_time.start || period_for_system_time.end) period_for_system_time.start || period_for_system_time.end)
return false; return false;
return create_sys_trx_field_if_missing(thd, "sys_trx_start", alter_info, return create_sys_trx_field(thd, "sys_trx_start", alter_info,
&generated_as_row.start, integer_fields) || &generated_as_row.start, integer_fields) ||
create_sys_trx_field_if_missing(thd, "sys_trx_end", alter_info, create_sys_trx_field(thd, "sys_trx_end", alter_info,
&generated_as_row.end, integer_fields) || &generated_as_row.end, integer_fields) ||
create_string(thd->mem_root, &period_for_system_time.start, create_string(thd->mem_root, &period_for_system_time.start,
"sys_trx_start") || "sys_trx_start") ||
create_string(thd->mem_root, &period_for_system_time.end, create_string(thd->mem_root, &period_for_system_time.end,
...@@ -6732,4 +6732,3 @@ bool Vers_parse_info::check(THD *thd, Alter_info *alter_info, bool integer_field ...@@ -6732,4 +6732,3 @@ bool Vers_parse_info::check(THD *thd, Alter_info *alter_info, bool integer_field
return r; // false means no error return r; // false means no error
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment