From dba43f4bec72362bbb0959328a5b80847ae97a86 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 30 Mar 2018 18:54:52 +0200 Subject: [PATCH] fix comparison of row_start/row_end --- sql/handler.cc | 8 ++++---- sql/handler.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sql/handler.cc b/sql/handler.cc index fab3e2609a4..a0a2e4f2703 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -6884,8 +6884,8 @@ static bool vers_create_sys_field(THD *thd, const char *field_name, return false; } -const LString Vers_parse_info::default_start= "row_start"; -const LString Vers_parse_info::default_end= "row_end"; +const LString_i Vers_parse_info::default_start= "row_start"; +const LString_i Vers_parse_info::default_end= "row_end"; bool Vers_parse_info::fix_implicit(THD *thd, Alter_info *alter_info, int *added) { @@ -7190,8 +7190,8 @@ bool Vers_parse_info::fix_alter_info(THD *thd, Alter_info *alter_info, create_info->options|= HA_VERSIONED_TABLE; DBUG_ASSERT(share->vers_start_field() && share->vers_end_field()); - LString start(share->vers_start_field()->field_name); - LString end(share->vers_end_field()->field_name); + LString_i start(share->vers_start_field()->field_name); + LString_i end(share->vers_end_field()->field_name); DBUG_ASSERT(start.ptr() && end.ptr()); as_row= start_end_t(start, end); diff --git a/sql/handler.h b/sql/handler.h index 502700d2046..342ca20f44d 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -1960,8 +1960,8 @@ protected: bool native); public: - static const LString default_start; - static const LString default_end; + static const LString_i default_start; + static const LString_i default_end; bool fix_alter_info(THD *thd, Alter_info *alter_info, HA_CREATE_INFO *create_info, TABLE *table);