bk commit into 5.1 tree (tomas:1.2097)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.2097 06/01/31 19:58:00 tomas@stripped +1 -0
  Merge tulin@stripped:/home/bk/mysql-5.1-new
  into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

  sql/ha_ndbcluster.cc
    1.250 06/01/31 19:57:50 tomas@stripped +0 -0
    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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new/RESYNC

--- 1.249/sql/ha_ndbcluster.cc	2006-01-31 17:21:28 +01:00
+++ 1.250/sql/ha_ndbcluster.cc	2006-01-31 19:57:50 +01:00
@@ -8847,6 +8847,33 @@
 }
 
 /*
+  get table space info for SHOW CREATE TABLE
+*/
+char* ha_ndbcluster::get_tablespace_create_info()
+{
+  const char tablespace_key[]= " TABLESPACE ";
+  const char storage_key[]= " STORAGE DISK";
+  char*	str= 0;
+
+  Ndb *ndb= get_ndb();
+  NDBDICT *ndbdict= ndb->getDictionary();
+  ndb->setDatabaseName(m_dbname);
+  const NDBTAB *ndbtab= ndbdict->getTable(m_tabname);
+  if (ndbtab == 0)
+    return 0;
+
+  // TODO retrieve table space name if there is one
+  return 0;
+
+  const char *tablespace_name= "<name>";
+
+  uint len= sizeof(tablespace_key) + strlen(tablespace_name) + sizeof(storage_key);
+  str= my_malloc(len, MYF(0));
+  strxnmov(str, len, tablespace_key, tablespace_name, storage_key, NullS);
+  return(str);
+}
+
+/*
   Implements the SHOW NDB STATUS command.
 */
 bool