database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

BUG#19188: incorrect temporary table name of DROP query in replication

Browse Source 
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:
unknown
2006-05-14 20:31:42 +03:00
parent ac812dfc91
commit b9558d8bda
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/mysql_priv.h
View File

@@ -1602,7 +1602,7 @@ inline void write_binlog_with_system_charset(THD * thd, Query_log_event * qinfo)
inline bool is_user_table(TABLE * table) 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); return strncmp(name, tmp_file_prefix, tmp_file_prefix_length);
} }

6
sql/sql_base.cc
View File

@@ -706,10 +706,10 @@ void close_temporary_tables(THD *thd)
We are going to add 4 ` around the db/table names and possible more We are going to add 4 ` around the db/table names and possible more
due to special characters in the names 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('.'); s_query.q_append('.');
append_identifier(thd, &s_query, table->real_name, append_identifier(thd, &s_query, table->s->table_name,
strlen(table->real_name)); strlen(table->s->table_name));
s_query.q_append(','); s_query.q_append(',');
next= table->next; next= table->next;
close_temporary(table, 1); close_temporary(table, 1);