From 7d91d98ac12a849eebc553989b706bb820b94d79 Mon Sep 17 00:00:00 2001
From: Alexander Barkov <bar@mariadb.com>
Date: Mon, 21 May 2018 10:16:13 +0400
Subject: [PATCH] A cleanup for 2a33d248e0bd910ec10a2bb68e47f17b47e3a980

- Removing the unused "THD*" paramer from Lex_ident_sys_st::to_size_number()
- Removing redundant #include for "sql_tvc.h" and "vers_utils.h"
---
 sql/sql_lex.cc      | 2 +-
 sql/sql_lex.h       | 2 +-
 sql/sql_yacc.yy     | 4 +---
 sql/sql_yacc_ora.yy | 4 +---
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 2e54177dcc2..80baf7478a0 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -7980,7 +7980,7 @@ bool Lex_ident_sys_st::convert(THD *thd,
 }
 
 
-bool Lex_ident_sys_st::to_size_number(THD *thd, ulonglong *to) const
+bool Lex_ident_sys_st::to_size_number(ulonglong *to) const
 {
   ulonglong number;
   uint text_shift_number= 0;
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 2369568e8a9..2517fb6b544 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -143,7 +143,7 @@ public:
   bool convert(THD *thd, const LEX_CSTRING *str, CHARSET_INFO *cs);
   bool copy_or_convert(THD *thd, const Lex_ident_cli_st *str, CHARSET_INFO *cs);
   bool is_null() const { return str == NULL; }
-  bool to_size_number(THD *thd, ulonglong *to) const;
+  bool to_size_number(ulonglong *to) const;
 };
 
 
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 8ece55725de..157b5636806 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -67,8 +67,6 @@
 #include "lex_token.h"
 #include "sql_lex.h"
 #include "sql_sequence.h"
-#include "sql_tvc.h"
-#include "vers_utils.h"
 #include "my_base.h"
 
 /* this is to get the bison compilation windows warnings out */
@@ -5142,7 +5140,7 @@ size_number:
           real_ulonglong_num { $$= $1;}
         | IDENT_sys
           {
-            if ($1.to_size_number(thd, &$$))
+            if ($1.to_size_number(&$$))
               MYSQL_YYABORT;
           }
         ;
diff --git a/sql/sql_yacc_ora.yy b/sql/sql_yacc_ora.yy
index 52e585d7be4..5701880ecb9 100644
--- a/sql/sql_yacc_ora.yy
+++ b/sql/sql_yacc_ora.yy
@@ -67,8 +67,6 @@
 #include "lex_token.h"
 #include "sql_lex.h"
 #include "sql_sequence.h"
-#include "sql_tvc.h"
-#include "vers_utils.h"
 #include "my_base.h"
 
 /* this is to get the bison compilation windows warnings out */
@@ -5100,7 +5098,7 @@ size_number:
           real_ulonglong_num { $$= $1;}
         | IDENT_sys
           {
-            if ($1.to_size_number(thd, &$$))
+            if ($1.to_size_number(&$$))
               MYSQL_YYABORT;
           }
         ;