bk commit into 5.1 tree (mskold:1.2371) BUG#24667

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.1 repository of marty. When marty 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-01-02 10:05:58+01:00, mskold@stripped +1 -0
  bug#24667  After ALTER TABLE operation ndb_dd table becomes regular ndb: removed use of
environment variable NDB_DEFAULT_DISK

  sql/ha_ndbcluster.cc@stripped, 2007-01-02 10:04:53+01:00, mskold@stripped +1 -1
    bug#24667  After ALTER TABLE operation ndb_dd table becomes regular ndb: removed use
of environment variable NDB_DEFAULT_DISK

# 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:	mskold
# Host:	linux.site
# Root:	/windows/Linux_space/MySQL/mysql-5.1-new-ndb

--- 1.384/sql/ha_ndbcluster.cc	2007-01-02 10:06:10 +01:00
+++ 1.385/sql/ha_ndbcluster.cc	2007-01-02 10:06:10 +01:00
@@ -4806,7 +4806,7 @@ int ha_ndbcluster::create(const char *na
     if ((my_errno= create_ndb_column(col, field, info)))
       DBUG_RETURN(my_errno);
  
-    if (info->storage_media == HA_SM_DISK || getenv("NDB_DEFAULT_DISK"))
+    if (info->storage_media == HA_SM_DISK)
       col.setStorageType(NdbDictionary::Column::StorageTypeDisk);
     else
       col.setStorageType(NdbDictionary::Column::StorageTypeMemory);