Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1

into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
474760fb · mskold/marty@linux.site · 7281ab80 · 40ab7bdb · 474760fb
Commit 474760fb authored Jan 02, 2007 by mskold/marty@linux.site
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/ha_ndbcluster.cc sql/ha_ndbcluster.cc +1 -1

No files found.
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -4806,7 +4806,7 @@ int ha_ndbcluster::create(const char *name,
    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);