bk commit into 5.1 tree (jonas:1.2200) BUG#20008

[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
  1.2200 06/06/22 14:57:43 jonas@stripped +3 -0
  ndb - bug#20008
    no DD when diskless

  storage/ndb/src/ndbapi/ndberror.c
    1.62 06/06/22 14:57:40 jonas@stripped +1 -0
    New error code for create file when diskless

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.90 06/06/22 14:57:40 jonas@stripped +11 -0
    New error code for create file when diskless

  storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp
    1.3 06/06/22 14:57:40 jonas@stripped +2 -1
    New error code for create file when diskless

# 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.2/storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp	2006-06-22 10:24:40
+02:00
+++ 1.3/storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp	2006-06-22 14:57:40
+02:00
@@ -159,7 +159,8 @@ struct CreateFileRef {
     InvalidFilegroupVersion = 754,
     FilenameAlreadyExists = 760,
     OutOfFileRecords = 751,
-    InvalidFileType = 750
+    InvalidFileType = 750,
+    NotSupportedWhenDiskless = 775
   };
   
   Uint32 senderData;

--- 1.89/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-06-22 10:24:40 +02:00
+++ 1.90/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-06-22 14:57:40 +02:00
@@ -15153,6 +15153,17 @@ Dbdict::create_file_prepare_start(Signal
       break;
     }
     
+    {
+      Uint32 dl;
+      const ndb_mgm_configuration_iterator * p = 
+	m_ctx.m_config.getOwnConfigIterator();
+      if(!ndb_mgm_get_int_parameter(p, CFG_DB_DISCLESS, &dl) && dl)
+      {
+	op->m_errorCode = CreateFileRef::NotSupportedWhenDiskless;
+	break;
+      }
+    }
+    
     // Loop through all filenames...
     if(!c_obj_pool.seize(obj_ptr)){
       op->m_errorCode = CreateTableRef::NoMoreTableRecords;

--- 1.61/storage/ndb/src/ndbapi/ndberror.c	2006-06-12 14:35:56 +02:00
+++ 1.62/storage/ndb/src/ndbapi/ndberror.c	2006-06-22 14:57:40 +02:00
@@ -417,6 +417,7 @@ ErrorBundle ErrorCodes[] = {
   { 1514, DMEC, SE, "Currently there is a limit of one logfile group" },
   
   { 773,  DMEC, SE, "Out of string memory, please modify StringMemory config parameter"
},
+  { 775,  DMEC, SE, "Create file is not supported when Diskless=1" },
   
   /**
    * FunctionNotImplemented