Commit 4189bfa4 authored by unknown's avatar unknown

Bug#17263: incorrect DROP query in temporary tables replication

accounting non-ai32 in tmpkeyval. This changeset is supposed to be specifically for 4.1.
Another changeset is going to push into 5. 


sql/sql_base.cc:
  correction due to uint4korr definition: can not sizeof on not ia32.
parent 329ebbd1
...@@ -483,11 +483,10 @@ void close_temporary(TABLE *table,bool delete_table) ...@@ -483,11 +483,10 @@ void close_temporary(TABLE *table,bool delete_table)
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
/* close_temporary_tables' internal */ /* close_temporary_tables' internal, 4 is due to uint4korr definition */
static inline uint tmpkeyval(THD *thd, TABLE *table) static inline uint tmpkeyval(THD *thd, TABLE *table)
{ {
return uint4korr(table->table_cache_key + table->key_length - return uint4korr(table->table_cache_key + table->key_length - 4);
sizeof(thd->variables.pseudo_thread_id));
} }
/* Creates one DROP TEMPORARY TABLE binlog event for each pseudo-thread */ /* Creates one DROP TEMPORARY TABLE binlog event for each pseudo-thread */
...@@ -513,7 +512,7 @@ void close_temporary_tables(THD *thd) ...@@ -513,7 +512,7 @@ void close_temporary_tables(THD *thd)
*/ */
for (prev_table= thd->temporary_tables, for (prev_table= thd->temporary_tables,
table= prev_table->next, table= prev_table->next,
found_user_tables= (prev_table->table_name[0] != '#'); found_user_tables= (prev_table->real_name[0] != '#');
table; table;
prev_table= table, table= table->next) prev_table= table, table= table->next)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment