bk commit into 4.1 tree (aelkin:1.2470) BUG#17263

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
4.1 repository of elkin. When elkin does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2470 06/04/23 19:42:26 aelkin@stripped +1 -0
  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
    1.267 06/04/23 19:42:21 aelkin@stripped +3 -4
    correction due to uint4korr definition: can not sizeof on not ia32.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	aelkin
# Host:	dsl-hkigw8-feb0de00-199.dhcp.inet.fi
# Root:	/net/nb/home/elkin/MySQL/FIXES/4.1-bug17263-temp_drop

--- 1.266/sql/sql_base.cc	2006-04-23 11:55:04 +03:00
+++ 1.267/sql/sql_base.cc	2006-04-23 19:42:21 +03:00
@@ -483,11 +483,10 @@
   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)
 {
-  return uint4korr(table->table_cache_key + table->key_length - 
-                   sizeof(thd->variables.pseudo_thread_id));
+  return uint4korr(table->table_cache_key + table->key_length - 4);
 }
 
 /* Creates one DROP TEMPORARY TABLE binlog event for each pseudo-thread */
@@ -513,7 +512,7 @@
   */
   for (prev_table= thd->temporary_tables, 
          table= prev_table->next,
-         found_user_tables= (prev_table->table_name[0] != '#'); 
+         found_user_tables= (prev_table->real_name[0] != '#'); 
        table;
        prev_table= table, table= table->next)
   {