From: magnus.blaudd
Date: May 31 2011 3:12pm
Subject: bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4435)
List-Archive: http://lists.mysql.com/commits/138465
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3315098510837082632=="

--===============3315098510837082632==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///data0/magnus/mysql/7.0/ based on revid:magnus.blaudd@stripped

 4435 magnus.blaudd@stripped	2011-05-31
      ndb
       - map the creat_info->storage_media to respective ndb value
         and save it in ndb's datadictionary when creating the table

    modified:
      sql/ha_ndbcluster.cc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-05-31 14:38:10 +0000
+++ b/sql/ha_ndbcluster.cc	2011-05-31 15:07:46 +0000
@@ -8437,6 +8437,20 @@ int ha_ndbcluster::create(const char *na
     goto abort_return;
   }
 
+  // Save the table level storage media setting
+  switch(create_info->storage_media)
+  {
+    case HA_SM_DISK:
+      tab.setStorageType(NdbDictionary::Column::StorageTypeDisk);
+      break;
+    case HA_SM_DEFAULT:
+      tab.setStorageType(NdbDictionary::Column::StorageTypeDefault);
+      break;
+    case HA_SM_MEMORY:
+      tab.setStorageType(NdbDictionary::Column::StorageTypeMemory);
+      break;
+  }
+
   DBUG_PRINT("info", ("Table %s is %s stored with tablespace %s",
                       m_tabname,
                       (use_disk) ? "disk" : "memory",


--===============3315098510837082632==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/magnus.blaudd@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@stripped\
#   6m52zkcxztwemj60
# target_branch: file:///data0/magnus/mysql/7.0/
# testament_sha1: 6ca8c983b569d2c32721112dacdf1f83ed17366e
# timestamp: 2011-05-31 17:12:11 +0200
# base_revision_id: magnus.blaudd@stripped\
#   81kyoy1ezotxpqqq
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWY/UGv0AAa7fgFAQUOP//39v
niC////6UAQNbVeO6BpOi7BkhMp6JimwmEnpPVPU9TxGoYmymnqZpHppkmgkkqe1TzTQp5NJo000
w1AAAAAAAYimpmpqbRPU09TE0MhpoHqAaAxBoAcwJiaDCZMmTIwmCaaZGJgCGASUTTTKbRNGJko8
o8BNTEAANADT1CyB8SWhu+UMmos+EAtO2Dxng2Vi5kUgAe+5bY2LunJBYkJGymqzUoJafMapJnZk
MSFq2cU7R1Np/c9qQcCuJg9l5UDt/CPAIBx6ltyyOFN1ddQfrKkIes8HxdVVUkGEcRFuUVQYD3MM
9WiR1csJNdIxK1IvrHeKYvhAeuIY4HCAZsBBeA3xQXBGOYHHgQgLBsGQUzPXO2sRPmmDbeI1ifLR
QIgIkfZI1jQoyKBCIcxdHQFXolk1+AaEBLEXKgHFIEP5LIKkCL073qEKGQDjZg1sSpPlcItzmnkN
SYrKxX7qoz1H2Z7YWMYhyocOMdj5kTjWmok7KSE+Ec19EW5BjlAv79xEoFbxFU4RbV4w2SM1TWl5
Edi0ThveLbRAgXQqpn0IYXGfEXCzTrTzc2ByYSFiUldNb1rNRCvcQiUGIZgzkMqdWx0T46XtnxQx
nFQ4ua0U2KiE8o47+UzsIlTQdJ6AaMNNtRRCwsHi5VhQE4EJVwisqsZY3xRdOXl3Q5Iz6C6FCg30
nmGXlB6cG5yvlzwQLLt5wcuLjDjMZ9ng8ecJUa3QIhPYdu5g/BUaU1Zu2/QG6HHdCR37iR1joZ8+
wQYkAP6JDTN70vbkdjjIaBtLBDGik8CRjkzbHGI21PYV19qzaNo8SQ8ZvU6wJzEIfAepefLJXdGi
EictJEmTWjQKdgKPoVNY2YNN4zhplDOkONhIskgPuUNJIrfKUvEPk2+Y6FZ0/ilhNTzAAYF+mKRQ
mrFwZ16Z6hfIFpGKtzRWcxeR/HGlZdXVaw2+u416Z7epl8mnQXluuIpi0K1LLqr24QwDIsBxpChB
UDLnyWjOthoGOQS8+n6PtKhqrCLEYJiQkabzUB+9wrL8vmJSw0XG0SqzGHYUcwYk0tOAU0Djtwsn
zhOHM3hXTbsfRumFhMzSt4nWBoNwY72BEMjQ5AtrJJDTLVb1kJuxUJgjmLAPAzDOJ7FM68TPpLax
Y36SzyTzEYSNKQTEWCUkChxSp3I2XnXTSidimSGqvSwqf0VwJ4HgcdEiCFBc2xYV0BxOQXP1qRde
xicPFPG2WD/8EJPDkR3kXAwK8BSAWwNCciyWxp2ENVhkVnbhPXQ/WNSyZf2BIgQv1QlVfOpHEacI
M0FwXXNGVipTzh+ia1PxXegSRLtUMxmD7EYO514Cyjxw2slAlkwkSx8AUFWEGKrLwFIOJdjUkZnN
aqciQ1c655Mk9MCosE+LQqJ0WCeiYGK04B+xPKZHiFMh4pH/F3JFOFCQj9Qa/Q==


--===============3315098510837082632==--