bk commit into 5.1 tree (tomas:1.2689)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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@stripped, 2007-12-11 19:51:44+01:00, tomas@stripped +1 -0
  remove memleak cased by dynamic variables being lost

  sql/ha_ndbcluster_binlog.cc@stripped, 2007-12-11 19:51:41+01:00, tomas@stripped +2 -2
    remove memleak cased by dynamic variables being lost

diff -Nrup a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc
--- a/sql/ha_ndbcluster_binlog.cc	2007-12-10 10:25:55 +01:00
+++ b/sql/ha_ndbcluster_binlog.cc	2007-12-11 19:51:41 +01:00
@@ -243,7 +243,7 @@ static void run_query(THD *thd, char *bu
 {
   ulong save_thd_query_length= thd->query_length;
   char *save_thd_query= thd->query;
-  struct system_variables save_thd_variables= thd->variables;
+  ulong save_thread_id= thd->variables.pseudo_thread_id;
   struct system_status_var save_thd_status_var= thd->status_var;
   THD_TRANS save_thd_transaction_all= thd->transaction.all;
   THD_TRANS save_thd_transaction_stmt= thd->transaction.stmt;
@@ -281,7 +281,7 @@ static void run_query(THD *thd, char *bu
   thd->options= save_thd_options;
   thd->query_length= save_thd_query_length;
   thd->query= save_thd_query;
-  thd->variables= save_thd_variables;
+  thd->variables.pseudo_thread_id= save_thread_id;
   thd->status_var= save_thd_status_var;
   thd->transaction.all= save_thd_transaction_all;
   thd->transaction.stmt= save_thd_transaction_stmt;