A cleanup for 2a33d24

- Removing the unused "THD*" paramer from Lex_ident_sys_st::to_size_number() - Removing redundant #include for "sql_tvc.h" and "vers_utils.h"
MariaDB · May 21, 2018 · 7d91d98 · 7d91d98
1 parent b73083c
commit 7d91d98
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git 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
@@ -143,7 +143,7 @@ struct Lex_ident_sys_st: public LEX_CSTRING
   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
@@ -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
@@ -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;
           }
         ;