bk commit into 5.1 tree (lzhou:1.2574) BUG#32662

[lzhou]

Below is the list of changes that have just been committed into a local
5.1 repository of lzhou.  When lzhou 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, 2008-04-22 16:01:26+00:00, lzhou@dev3-63.(none) +3 -0
  BUG#32662 Return correct error message when creating an existed tablespace

  storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp@stripped, 2008-04-22
16:01:17+00:00, lzhou@dev3-63.(none) +1 -0
    Add new errorcode for object exist

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@stripped, 2008-04-22 16:01:17+00:00,
lzhou@dev3-63.(none) +1 -1
    Return correct errorCode to client

  storage/ndb/src/ndbapi/ndberror.c@stripped, 2008-04-22 16:01:17+00:00, lzhou@dev3-63.(none)
+1 -0
    Add new error code description

diff -Nrup a/storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp
b/storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp
--- a/storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp	2007-04-16 09:43:12 +00:00
+++ b/storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp	2008-04-22 16:01:17 +00:00
@@ -67,6 +67,7 @@ struct CreateFilegroupRef {
     InvalidUndoBufferSize = 779,
     NoSuchLogfileGroup = 767,
     InvalidFilegroupVersion = 768,
+    ObjectAlreadyExists = 1603,
     SingleUser = 299
   };
   
diff -Nrup a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
--- a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2008-04-03 12:21:15 +00:00
+++ b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2008-04-22 16:01:17 +00:00
@@ -15807,7 +15807,7 @@ Dbdict::create_fg_prepare_start(Signal* 
     Uint32 hash = Rope::hash(fg.FilegroupName, len);
     if(get_object(fg.FilegroupName, len, hash) != 0){
       jam();
-      op->m_errorCode = CreateTableRef::TableAlreadyExist;
+      op->m_errorCode = CreateFilegroupRef::ObjectAlreadyExists;
       break;
     }
     
diff -Nrup a/storage/ndb/src/ndbapi/ndberror.c b/storage/ndb/src/ndbapi/ndberror.c
--- a/storage/ndb/src/ndbapi/ndberror.c	2008-01-31 14:23:18 +00:00
+++ b/storage/ndb/src/ndbapi/ndberror.c	2008-04-22 16:01:17 +00:00
@@ -206,6 +206,7 @@ ErrorBundle ErrorCodes[] = {
   { 905,  DMEC, IS, "Out of attribute records (increase MaxNoOfAttributes)" },
   { 1601, HA_ERR_RECORD_FILE_FULL, IS, "Out extents, tablespace full" },
   { 1602, DMEC, IS,"No datafile in tablespace" },
+  { 1603, DMEC, IS,"Object with given name already exists" },
 
   /**
    * TimeoutExpired