bk commit into 5.1 tree (jonas:1.2354) BUG#25001

[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, 2006-12-12 13:09:20+01:00, jonas@stripped +2 -0
  ndb - bug#25001
    make sure DISK flag is set on DATA column for blob table

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp@stripped, 2006-12-12 13:09:18+01:00,
jonas@stripped +6 -2
    maek sure DISK flag is set on DATA column fro blob table

  storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp@stripped, 2006-12-12 13:09:18+01:00,
jonas@stripped +1 -1
    maek sure DISK flag is set on DATA column fro blob 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-work

--- 1.155/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2006-12-12 13:09:24 +01:00
+++ 1.156/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2006-12-12 13:09:24 +01:00
@@ -2302,7 +2302,7 @@
   }
 
   // blob tables - use "t2" to get values set by kernel
-  if (t2->m_noOfBlobs != 0 && createBlobTables(*t2) != 0) {
+  if (t2->m_noOfBlobs != 0 && createBlobTables(t, *t2) != 0) {
     int save_code = m_error.code;
     (void)dropTableGlobal(*t2);
     m_error.code = save_code;
@@ -2316,7 +2316,7 @@
 }
 
 int
-NdbDictionaryImpl::createBlobTables(NdbTableImpl &t)
+NdbDictionaryImpl::createBlobTables(NdbTableImpl& orig, NdbTableImpl &t)
 {
   DBUG_ENTER("NdbDictionaryImpl::createBlobTables");
   for (unsigned i = 0; i < t.m_columns.size(); i++) {
@@ -2325,6 +2325,10 @@
       continue;
     NdbTableImpl bt;
     NdbBlob::getBlobTable(bt, &t, &c);
+    NdbDictionary::Column::StorageType 
+      d = NdbDictionary::Column::StorageTypeDisk;
+    if (orig.m_columns[i]->getStorageType() == d)
+      bt.getColumn("DATA")->setStorageType(d);
     if (createTable(bt) != 0) {
       DBUG_RETURN(-1);
     }

--- 1.69/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp	2006-12-12 13:09:24 +01:00
+++ 1.70/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp	2006-12-12 13:09:24 +01:00
@@ -582,7 +582,7 @@
   bool setTransporter(class TransporterFacade * tf);
 
   int createTable(NdbTableImpl &t);
-  int createBlobTables(NdbTableImpl& t);
+  int createBlobTables(NdbTableImpl& org, NdbTableImpl& created);
   int alterTable(NdbTableImpl &t);
   int dropTable(const char * name);
   int dropTable(NdbTableImpl &);