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);
} }

26
sql/sql_base.cc
View File

@@ -620,7 +620,7 @@ void close_temporary_tables(THD *thd)
TABLE *table; TABLE *table;
if (!thd->temporary_tables) if (!thd->temporary_tables)
return; return;
if (!mysql_bin_log.is_open()) if (!mysql_bin_log.is_open())
{ {
for (table= thd->temporary_tables; table; table= table->next) for (table= thd->temporary_tables; table; table= table->next)
@@ -642,12 +642,12 @@ void close_temporary_tables(THD *thd)
String s_query= String(buf, sizeof(buf), system_charset_info); String s_query= String(buf, sizeof(buf), system_charset_info);
bool found_user_tables= false; bool found_user_tables= false;
LINT_INIT(next); LINT_INIT(next);
/* /*
insertion sort of temp tables by pseudo_thread_id to build ordered list insertion sort of temp tables by pseudo_thread_id to build ordered list
of sublists of equal pseudo_thread_id of sublists of equal pseudo_thread_id
*/ */
for (prev_table= thd->temporary_tables, table= prev_table->next; for (prev_table= thd->temporary_tables, table= prev_table->next;
table; table;
prev_table= table, table= table->next) prev_table= table, table= table->next)
@@ -657,7 +657,7 @@ void close_temporary_tables(THD *thd)
{ {
if (!found_user_tables) if (!found_user_tables)
found_user_tables= true; found_user_tables= true;
for (prev_sorted= NULL, sorted= thd->temporary_tables; sorted != table; for (prev_sorted= NULL, sorted= thd->temporary_tables; sorted != table;
prev_sorted= sorted, sorted= sorted->next) prev_sorted= sorted, sorted= sorted->next)
{ {
if (!is_user_table(sorted) || if (!is_user_table(sorted) ||
@@ -666,7 +666,7 @@ void close_temporary_tables(THD *thd)
/* move into the sorted part of the list from the unsorted */ /* move into the sorted part of the list from the unsorted */
prev_table->next= table->next; prev_table->next= table->next;
table->next= sorted; table->next= sorted;
if (prev_sorted) if (prev_sorted)
{ {
prev_sorted->next= table; prev_sorted->next= table;
} }
@@ -687,11 +687,11 @@ void close_temporary_tables(THD *thd)
{ {
thd->options |= OPTION_QUOTE_SHOW_CREATE; thd->options |= OPTION_QUOTE_SHOW_CREATE;
} }
/* scan sorted tmps to generate sequence of DROP */ /* scan sorted tmps to generate sequence of DROP */
for (table= thd->temporary_tables; table; table= next) for (table= thd->temporary_tables; table; table= next)
{ {
if (is_user_table(table)) if (is_user_table(table))
{ {
/* Set pseudo_thread_id to be that of the processed table */ /* Set pseudo_thread_id to be that of the processed table */
thd->variables.pseudo_thread_id= tmpkeyval(thd, table); thd->variables.pseudo_thread_id= tmpkeyval(thd, table);
@@ -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);
@@ -730,7 +730,7 @@ void close_temporary_tables(THD *thd)
qinfo.error_code= 0; qinfo.error_code= 0;
write_binlog_with_system_charset(thd, &qinfo); write_binlog_with_system_charset(thd, &qinfo);
} }
else else
{ {
next= table->next; next= table->next;
close_temporary(table, 1); close_temporary(table, 1);