bk commit into 5.0 tree (msvensson:1.1780)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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.1780 05/03/10 13:09:41 msvensson@neptunus.(none) +3 -0
  Removed faulty impl.

  sql/ha_ndbcluster.cc
    1.159 05/03/10 13:09:37 msvensson@neptunus.(none) +0 -9
    Removed this change, it will be modified later anyway

  sql/sql_class.h
    1.220 05/03/10 13:07:12 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/mysqld.cc
    1.435 05/03/10 13:07:12 msvensson@neptunus.(none) +0 -1
    Auto merged

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0-ndb/RESYNC

--- 1.219/sql/sql_class.h	2005-03-03 15:37:46 +01:00
+++ 1.220/sql/sql_class.h	2005-03-10 13:07:12 +01:00
@@ -1131,7 +1131,6 @@
   table_map  used_tables;
   USER_CONN *user_connect;
   CHARSET_INFO *db_charset;
-  List<TABLE> temporary_tables_should_be_free; // list of temporary tables
   /*
     FIXME: this, and some other variables like 'count_cuted_fields'
     maybe should be statement/cursor local, that is, moved to Statement

--- 1.158/sql/ha_ndbcluster.cc	2005-03-03 08:50:34 +01:00
+++ 1.159/sql/ha_ndbcluster.cc	2005-03-10 13:09:37 +01:00
@@ -5675,7 +5675,7 @@
   }
 
   List<NDB_SHARE> util_open_tables;
-  set_timespec(abstime, ndb_cache_check_time);
+  set_timespec(abstime, 0);
   for (;;)
   {
 
@@ -5693,6 +5693,7 @@
 
     if (ndb_cache_check_time == 0)
     {
+      /* Wake up in 10 seconds to check if value has changed */
       set_timespec(abstime, 10);
       continue;
     }