bk commit into 5.1 tree (mskold:1.2376) 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-02 22:31:29+01:00, mskold@stripped +4 -0
  bug #25296  Truncate table converts NDB disk based tables to in-memory tables: implemented ha_ndbcluster::update_create_info

  mysql-test/r/ndb_dd_alter.result@stripped, 2007-01-02 22:30:57+01:00, mskold@stripped +22 -1
    ug #25296  Truncate table converts NDB disk based tables to in-memory tables: implemented ha_ndbcluster::update_create_info

  mysql-test/t/ndb_dd_alter.test@stripped, 2007-01-02 22:30:57+01:00, mskold@stripped +3 -0
    ug #25296  Truncate table converts NDB disk based tables to in-memory tables: implemented ha_ndbcluster::update_create_info

  sql/ha_ndbcluster.cc@stripped, 2007-01-02 22:30:57+01:00, mskold@stripped +6 -0
    ug #25296  Truncate table converts NDB disk based tables to in-memory tables: implemented ha_ndbcluster::update_create_info

  sql/ha_ndbcluster.h@stripped, 2007-01-02 22:30:57+01:00, mskold@stripped +1 -0
    ug #25296  Truncate table converts NDB disk based tables to in-memory tables: implemented ha_ndbcluster::update_create_info

# 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.3/mysql-test/r/ndb_dd_alter.result	2007-01-02 22:31:40 +01:00
+++ 1.4/mysql-test/r/ndb_dd_alter.result	2007-01-02 22:31:40 +01:00
@@ -419,6 +419,27 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`a1`),
   KEY `a3_i` (`a3`)
 ) /*!50100 TABLESPACE ts STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
+TRUNCATE TABLE test.t1;
+SHOW CREATE TABLE test.t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a1` int(11) NOT NULL,
+  `a2` float DEFAULT NULL,
+  `a3` double DEFAULT NULL,
+  `a4` bit(1) DEFAULT NULL,
+  `a5` tinyint(4) DEFAULT NULL,
+  `a6` bigint(20) DEFAULT NULL,
+  `a7` date DEFAULT NULL,
+  `a8` time DEFAULT NULL,
+  `a9` datetime DEFAULT NULL,
+  `a10` tinytext,
+  `a11` mediumtext,
+  `a12` longtext,
+  `a13` text,
+  `a14` blob,
+  PRIMARY KEY (`a1`),
+  KEY `a3_i` (`a3`)
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1
 ALTER TABLE test.t1 DROP a14;
 ALTER TABLE test.t1 DROP a13;
 ALTER TABLE test.t1 DROP a12;
@@ -438,7 +459,7 @@ t1	CREATE TABLE `t1` (
   `a4` bit(1) DEFAULT NULL,
   `a5` tinyint(4) DEFAULT NULL,
   KEY `a3_i` (`a3`)
-) /*!50100 TABLESPACE ts STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1
 DROP TABLE test.t1;
 ALTER TABLESPACE ts
 DROP DATAFILE './table_space/datafile.dat'

--- 1.3/mysql-test/t/ndb_dd_alter.test	2007-01-02 22:31:40 +01:00
+++ 1.4/mysql-test/t/ndb_dd_alter.test	2007-01-02 22:31:40 +01:00
@@ -221,6 +221,9 @@ ALTER TABLE test.t1 DROP INDEX a2_i;
 
 SHOW CREATE TABLE test.t1;
 
+TRUNCATE TABLE test.t1;
+
+SHOW CREATE TABLE test.t1;
 
 #### Try to ALTER DD Tables and drop columns
 

--- 1.385/sql/ha_ndbcluster.cc	2007-01-02 22:31:40 +01:00
+++ 1.386/sql/ha_ndbcluster.cc	2007-01-02 22:31:40 +01:00
@@ -8309,6 +8309,12 @@ ha_ndbcluster::setup_recattr(const NdbRe
   DBUG_RETURN(0);
 }
 
+void ha_ndbcluster::update_create_info(HA_CREATE_INFO *create_info)
+{
+  if (get_tablespace_name(current_thd,0,0))
+    create_info->storage_media= HA_SM_DISK;
+}
+
 char*
 ha_ndbcluster::update_table_comment(
                                 /* out: table comment + additional */

--- 1.162/sql/ha_ndbcluster.h	2007-01-02 22:31:40 +01:00
+++ 1.163/sql/ha_ndbcluster.h	2007-01-02 22:31:40 +01:00
@@ -884,6 +884,7 @@ private:
                                   ulonglong *nb_reserved_values);
   bool uses_blob_value();
 
+  void update_create_info(HA_CREATE_INFO *create_info);
   char *update_table_comment(const char * comment);
 
   int write_ndb_file(const char *name);