diff options
| author | Monty <monty@mariadb.org> | 2018-01-07 18:03:44 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-01-30 21:33:55 +0200 |
| commit | a7e352b54ddfaf91c92951d605cb02a4ffd2676b (patch) | |
| tree | dc76f140342938ed2a0fe0e005100402762d5308 /sql/sql_parse.h | |
| parent | 921c5e931452301a09c84c53ffe35b81e6a1c71a (diff) | |
| download | mariadb-git-a7e352b54ddfaf91c92951d605cb02a4ffd2676b.tar.gz | |
Changed database, tablename and alias to be LEX_CSTRING
This was done in, among other things:
- thd->db and thd->db_length
- TABLE_LIST tablename, db, alias and schema_name
- Audit plugin database name
- lex->db
- All db and table names in Alter_table_ctx
- st_select_lex db
Other things:
- Changed a lot of functions to take const LEX_CSTRING* as argument
for db, table_name and alias. See init_one_table() as an example.
- Changed some function arguments from LEX_CSTRING to const LEX_CSTRING
- Changed some lists from LEX_STRING to LEX_CSTRING
- threads_mysql.result changed because process list_db wasn't always
correctly updated
- New append_identifier() function that takes LEX_CSTRING* as arguments
- Added new element tmp_buff to Alter_table_ctx to separate temp name
handling from temporary space
- Ensure we store the length after my_casedn_str() of table/db names
- Removed not used version of rename_table_in_stat_tables()
- Changed Natural_join_column::table_name and db_name() to never return
NULL (used for print)
- thd->get_db() now returns db as a printable string (thd->db.str or "")
Diffstat (limited to 'sql/sql_parse.h')
| -rw-r--r-- | sql/sql_parse.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/sql_parse.h b/sql/sql_parse.h index b0371a2cb81..9c5deaf34c3 100644 --- a/sql/sql_parse.h +++ b/sql/sql_parse.h @@ -107,9 +107,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, bool is_com_multi, bool is_next_command); void log_slow_statement(THD *thd); bool append_file_to_dir(THD *thd, const char **filename_ptr, - const char *table_name); -bool append_file_to_dir(THD *thd, const char **filename_ptr, - const char *table_name); + const LEX_CSTRING *table_name); void execute_init_command(THD *thd, LEX_STRING *init_command, mysql_rwlock_t *var_lock); bool add_to_list(THD *thd, SQL_I_List<ORDER> &list, Item *group, bool asc); @@ -149,8 +147,9 @@ inline bool check_identifier_name(LEX_CSTRING *str) bool check_one_table_access(THD *thd, ulong privilege, TABLE_LIST *tables); bool check_single_table_access(THD *thd, ulong privilege, TABLE_LIST *tables, bool no_errors); -bool check_routine_access(THD *thd,ulong want_access,const char *db, - const char *name, +bool check_routine_access(THD *thd,ulong want_access, + const LEX_CSTRING *db, + const LEX_CSTRING *name, const Sp_handler *sph, bool no_errors); bool check_some_access(THD *thd, ulong want_access, TABLE_LIST *table); bool check_some_routine_access(THD *thd, const char *db, const char *name, @@ -165,8 +164,9 @@ inline bool check_one_table_access(THD *thd, ulong privilege, TABLE_LIST *tables inline bool check_single_table_access(THD *thd, ulong privilege, TABLE_LIST *tables, bool no_errors) { return false; } -inline bool check_routine_access(THD *thd,ulong want_access, const char *db, - const char *name, +inline bool check_routine_access(THD *thd,ulong want_access, + const LEX_CSTRING *db, + const LEX_CSTRING *name, const Sp_handler *sph, bool no_errors) { return false; } inline bool check_some_access(THD *thd, ulong want_access, TABLE_LIST *table) |