mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
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 "")
This commit is contained in:
@ -220,8 +220,8 @@ bool check_sequence_fields(LEX *lex, List<Create_field> *fields)
|
||||
|
||||
err:
|
||||
my_error(ER_SEQUENCE_INVALID_TABLE_STRUCTURE, MYF(0),
|
||||
lex->select_lex.table_list.first->db,
|
||||
lex->select_lex.table_list.first->table_name, reason);
|
||||
lex->select_lex.table_list.first->db.str,
|
||||
lex->select_lex.table_list.first->table_name.str, reason);
|
||||
DBUG_RETURN(TRUE);
|
||||
}
|
||||
|
||||
@ -843,7 +843,7 @@ bool Sql_cmd_alter_sequence::execute(THD *thd)
|
||||
No_such_table_error_handler no_such_table_handler;
|
||||
DBUG_ENTER("Sql_cmd_alter_sequence::execute");
|
||||
|
||||
if (check_access(thd, ALTER_ACL, first_table->db,
|
||||
if (check_access(thd, ALTER_ACL, first_table->db.str,
|
||||
&first_table->grant.privilege,
|
||||
&first_table->grant.m_internal,
|
||||
0, 0))
|
||||
@ -865,9 +865,9 @@ bool Sql_cmd_alter_sequence::execute(THD *thd)
|
||||
if (trapped_errors)
|
||||
{
|
||||
StringBuffer<FN_REFLEN> tbl_name;
|
||||
tbl_name.append(first_table->db);
|
||||
tbl_name.append(&first_table->db);
|
||||
tbl_name.append('.');
|
||||
tbl_name.append(first_table->table_name);
|
||||
tbl_name.append(&first_table->table_name);
|
||||
push_warning_printf(thd, Sql_condition::WARN_LEVEL_NOTE,
|
||||
ER_UNKNOWN_SEQUENCES,
|
||||
ER_THD(thd, ER_UNKNOWN_SEQUENCES),
|
||||
@ -909,8 +909,8 @@ bool Sql_cmd_alter_sequence::execute(THD *thd)
|
||||
if (new_seq->check_and_adjust(0))
|
||||
{
|
||||
my_error(ER_SEQUENCE_INVALID_DATA, MYF(0),
|
||||
first_table->db,
|
||||
first_table->table_name);
|
||||
first_table->db.str,
|
||||
first_table->table_name.str);
|
||||
error= 1;
|
||||
goto end;
|
||||
}
|
||||
|
Reference in New Issue
Block a user