bk commit into 5.1 tree (jonas:1.2328)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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-03-23 11:58:56+01:00, jonas@stripped +2 -0
  ndb - wl1190
    fix result (to remove red from pb)

  mysql-test/r/ndb_partition_key.result@stripped, 2007-03-23 11:58:54+01:00, jonas@stripped +4 -4
    fix result

  sql/ha_ndbcluster.cc@stripped, 2007-03-23 11:58:54+01:00, jonas@stripped +2 -2
    merge

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-dynattr

--- 1.5/mysql-test/r/ndb_partition_key.result	2007-03-23 11:59:01 +01:00
+++ 1.6/mysql-test/r/ndb_partition_key.result	2007-03-23 11:59:01 +01:00
@@ -59,10 +59,10 @@
 Row GCI: 1
 TableStatus: Retrieved
 -- Attributes -- 
-a Int PRIMARY KEY AT=FIXED ST=MEMORY
-b Char(10;latin1_bin) PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
-c Int PRIMARY KEY AT=FIXED ST=MEMORY
-d Int NULL AT=FIXED ST=MEMORY
+a Int PRIMARY KEY AT=FIXED ST=MEMORY DYNAMIC
+b Char(10;latin1_bin) PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY DYNAMIC
+c Int PRIMARY KEY AT=FIXED ST=MEMORY DYNAMIC
+d Int NULL AT=FIXED ST=MEMORY DYNAMIC
 
 -- Indexes -- 
 PRIMARY KEY(a, b, c) - UniqueHashIndex

--- 1.365/sql/ha_ndbcluster.cc	2007-03-23 11:59:01 +01:00
+++ 1.366/sql/ha_ndbcluster.cc	2007-03-23 11:59:01 +01:00
@@ -4847,8 +4847,8 @@
     else
     {
       col.setStorageType(NdbDictionary::Column::StorageTypeMemory);
-      col.setDynamic(info->row_type==ROW_TYPE_DYNAMIC);
-col.setDynamic(true); // For testing dynattr
+      col.setDynamic(create_info->row_type==ROW_TYPE_DYNAMIC);
+      col.setDynamic(true); // For testing dynattr
     }
 
     tab.addColumn(col);