mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
BUG#19188: incorrect temporary table name of DROP query in replication
manual merge to account 5.0 specific names of TABLE class sql/mysql_priv.h: manual merge: changing to 5.0's TABLE class names sql/sql_base.cc: manual merge: whitespaces and 5.0 TABLE's names
This commit is contained in:
@ -1602,7 +1602,7 @@ inline void write_binlog_with_system_charset(THD * thd, Query_log_event * qinfo)
|
||||
|
||||
inline bool is_user_table(TABLE * table)
|
||||
{
|
||||
const char *name= table->real_name;
|
||||
const char *name= table->s->table_name;
|
||||
return strncmp(name, tmp_file_prefix, tmp_file_prefix_length);
|
||||
}
|
||||
|
||||
|
@ -706,10 +706,10 @@ void close_temporary_tables(THD *thd)
|
||||
We are going to add 4 ` around the db/table names and possible more
|
||||
due to special characters in the names
|
||||
*/
|
||||
append_identifier(thd, &s_query, table->table_cache_key, strlen(table->table_cache_key));
|
||||
append_identifier(thd, &s_query, table->s->db, strlen(table->s->db));
|
||||
s_query.q_append('.');
|
||||
append_identifier(thd, &s_query, table->real_name,
|
||||
strlen(table->real_name));
|
||||
append_identifier(thd, &s_query, table->s->table_name,
|
||||
strlen(table->s->table_name));
|
||||
s_query.q_append(',');
|
||||
next= table->next;
|
||||
close_temporary(table, 1);
|
||||
|
Reference in New Issue
Block a user