bk commit into 5.1 tree (gni:1.2486) BUG#21699

[gni]

Below is the list of changes that have just been committed into a local
5.1 repository of root. When root 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-16 18:18:03+08:00, gni@stripped +3 -0
  BUG#21699 DROP last DATAFILE from TABLESPACE even though there are still table in it. And it gives the cofusing error message.

  storage/ndb/include/kernel/signaldata/Extent.hpp@stripped, 2007-03-16 18:18:00+08:00, gni@stripped +2 -1
    Add NoDatafile error code when allocating extent.

  storage/ndb/src/kernel/blocks/tsman.cpp@stripped, 2007-03-16 18:18:00+08:00, gni@stripped +6 -0
    when there is no datafile in spacefile , it should return NoDatafile error code, rather than NoExtentAvailable.

  storage/ndb/src/ndbapi/ndberror.c@stripped, 2007-03-16 18:18:00+08:00, gni@stripped +2 -1
    add no datafile error code and corresponding error message for NoDatafile

# 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:	gni
# Host:	dev3-221.dev.cn.tlan
# Root:	/home/ngb/mysql/mysql-5.1/mysql-5.1-bug21699

--- 1.4/storage/ndb/include/kernel/signaldata/Extent.hpp	2007-03-16 18:18:12 +08:00
+++ 1.5/storage/ndb/include/kernel/signaldata/Extent.hpp	2007-03-16 18:18:12 +08:00
@@ -31,7 +31,8 @@
 
   enum ErrorCode {
     UnmappedExtentPageIsNotImplemented = 1,
-    NoExtentAvailable = 1601
+    NoExtentAvailable = 1601,
+    NoDatafile = 1602
   };
   
   union 

--- 1.15/storage/ndb/src/kernel/blocks/tsman.cpp	2007-03-16 18:18:12 +08:00
+++ 1.16/storage/ndb/src/kernel/blocks/tsman.cpp	2007-03-16 18:18:12 +08:00
@@ -1483,6 +1483,12 @@
   {
     jam();
     err = AllocExtentReq::NoExtentAvailable;
+    Local_datafile_list full_tmp(m_file_pool, ts_ptr.p->m_full_files);
+    if (tmp.isEmpty() && full_tmp.isEmpty())
+    { 
+      jam();
+      err = AllocExtentReq::NoDatafile;
+    }
   }
   
   /**

--- 1.86/storage/ndb/src/ndbapi/ndberror.c	2007-03-16 18:18:13 +08:00
+++ 1.87/storage/ndb/src/ndbapi/ndberror.c	2007-03-16 18:18:13 +08:00
@@ -201,7 +201,8 @@
   { 904,  HA_ERR_INDEX_FILE_FULL, IS, "Out of fragment records (increase MaxNoOfOrderedIndexes)" },
   { 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" },
+
   /**
    * TimeoutExpired 
    */