bk commit into 5.1 tree (mskold:1.2379) BUG#25296

[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-04 09:15:09+01:00, mskold@stripped +1 -0
  bug #25296  Truncate table converts NDB disk based tables to in-memory tables: ha_ndbcluster::update_create_info should only update for TRUNCATE since we need to detect change of STORAGE at ALTER TABLE

  sql/ha_ndbcluster.cc@stripped, 2007-01-04 09:14:42+01:00, mskold@stripped +4 -2
    bug #25296  Truncate table converts NDB disk based tables to in-memory tables: ha_ndbcluster::update_create_info should only update for TRUNCATE since we need to detect change of STORAGE at ALTER TABLE

# 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.387/sql/ha_ndbcluster.cc	2007-01-04 09:15:22 +01:00
+++ 1.388/sql/ha_ndbcluster.cc	2007-01-04 09:15:22 +01:00
@@ -8311,8 +8311,10 @@ ha_ndbcluster::setup_recattr(const NdbRe
 
 void ha_ndbcluster::update_create_info(HA_CREATE_INFO *create_info)
 {
-  if (create_info->storage_media != HA_SM_MEMORY &&
-      get_tablespace_name(current_thd,0,0))
+  THD *thd= current_thd;
+
+  if (thd->lex->sql_command == SQLCOM_TRUNCATE &&
+      get_tablespace_name(thd,0,0))
     create_info->storage_media= HA_SM_DISK;
 }