database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

A cleanup for 2a33d248e0

Browse Source 
- Removing the unused "THD*" paramer from Lex_ident_sys_st::to_size_number()
- Removing redundant #include for "sql_tvc.h" and "vers_utils.h"
This commit is contained in:
Alexander Barkov
2018-05-21 10:16:13 +04:00
committed by Vladislav Vaintroub
parent b73083c57a
commit 7d91d98ac1
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_lex.cc
View File

@ -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; ulonglong number;
uint text_shift_number= 0; uint text_shift_number= 0;

2
sql/sql_lex.h
View File

@ -143,7 +143,7 @@ public:
bool convert(THD *thd, const LEX_CSTRING *str, CHARSET_INFO *cs); 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 copy_or_convert(THD *thd, const Lex_ident_cli_st *str, CHARSET_INFO *cs);
bool is_null() const { return str == NULL; } bool is_null() const { return str == NULL; }
bool to_size_number(THD *thd, ulonglong *to) const; bool to_size_number(ulonglong *to) const;
}; };

4
sql/sql_yacc.yy
View File

@ -67,8 +67,6 @@
#include "lex_token.h" #include "lex_token.h"
#include "sql_lex.h" #include "sql_lex.h"
#include "sql_sequence.h" #include "sql_sequence.h"
#include "sql_tvc.h"
#include "vers_utils.h"
#include "my_base.h" #include "my_base.h"
/* this is to get the bison compilation windows warnings out */ /* this is to get the bison compilation windows warnings out */
@ -5142,7 +5140,7 @@ size_number:
real_ulonglong_num { $$= $1;} real_ulonglong_num { $$= $1;}
| IDENT_sys | IDENT_sys
{ {
if ($1.to_size_number(thd, &$$)) if ($1.to_size_number(&$$))
MYSQL_YYABORT; MYSQL_YYABORT;
} }
; ;

4
sql/sql_yacc_ora.yy
View File

@ -67,8 +67,6 @@
#include "lex_token.h" #include "lex_token.h"
#include "sql_lex.h" #include "sql_lex.h"
#include "sql_sequence.h" #include "sql_sequence.h"
#include "sql_tvc.h"
#include "vers_utils.h"
#include "my_base.h" #include "my_base.h"
/* this is to get the bison compilation windows warnings out */ /* this is to get the bison compilation windows warnings out */
@ -5100,7 +5098,7 @@ size_number:
real_ulonglong_num { $$= $1;} real_ulonglong_num { $$= $1;}
| IDENT_sys | IDENT_sys
{ {
if ($1.to_size_number(thd, &$$)) if ($1.to_size_number(&$$))
MYSQL_YYABORT; MYSQL_YYABORT;
} }
; ;