bk commit into 5.1 tree (stewart:1.2037)

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart 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.2037 05/10/06 21:39:50 stewart@stripped +2 -0
  WL#2076 Add extra ndbd statistics
  
  report default logfile group for a tablespace in INFORMATION_SCHEMA

  sql/sql_show.cc
    1.274 05/10/06 21:39:47 stewart@stripped +1 -1
    change DEFAULT_LOGFILE_GROUP in TABLESPACES to a string.

  sql/ha_ndbcluster.cc
    1.155 05/10/06 21:39:46 stewart@stripped +2 -1
    Store default logfile group for tablespace in INFORMATION_SCHEMA.TABLESPACES

# 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:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.1/ndb-dd

--- 1.273/sql/sql_show.cc	2005-10-04 17:24:58 +10:00
+++ 1.274/sql/sql_show.cc	2005-10-06 21:39:47 +10:00
@@ -4113,7 +4113,7 @@
   {"ENGINE", NAME_LEN, MYSQL_TYPE_STRING, 0, 0, 0},
   {"VERSION", 1, MYSQL_TYPE_LONG, 0, 0, 0},
   {"EXTENT_SIZE", 1, MYSQL_TYPE_LONG, 0, 0, 0},
-  {"DEFAULT_LOGFILE_GROUP", 1, MYSQL_TYPE_LONG, 0, 0, 0},
+  {"DEFAULT_LOGFILE_GROUP", NAME_LEN, MYSQL_TYPE_STRING, 0, 0, 0},
   {0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
 };
 

--- 1.154/sql/ha_ndbcluster.cc	2005-10-04 17:24:58 +10:00
+++ 1.155/sql/ha_ndbcluster.cc	2005-10-06 21:39:46 +10:00
@@ -7905,12 +7905,13 @@
   {
     NdbDictionary::Dictionary::List::Element& elt = tslist.elements[i];
     NdbDictionary::Tablespace ts= dict->getTablespace(elt.name);
+    const char* dlfg= ts.getDefaultLogfileGroup();
 
     table->field[0]->store(elt.name,strlen(elt.name),system_charset_info);
     table->field[1]->store("NDB",3,system_charset_info);
     table->field[2]->store(ts.getObjectVersion());
     table->field[3]->store(ts.getExtentSize());
-    table->field[4]->store(0);
+    table->field[4]->store(dlfg, strlen(dlfg), system_charset_info);
 
     schema_table_store_record(thd, table);
   }