From: Date: January 24 2006 10:47am
Subject: bk commit into 5.1 tree (jonas:1.2072) BUG#16738
List-Archive: http://lists.mysql.com/commits/1553
X-Bug: 16738
Message-Id: <20060124094709.AD1EA2A8006@perch.ndb.mysql.com>

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.2072 06/01/24 10:47:04 jonas@stripped +4 -0
  bug#16738 - ndb dd - out of diskspace
    fix typo + add error code to printable list

  storage/ndb/src/ndbapi/ndberror.c
    1.49 06/01/24 10:47:01 jonas@stripped +3 -1
    Add error code to printable list

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
    1.28 06/01/24 10:47:01 jonas@stripped +1 -0
    Set correct error code

  storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp
    1.4 06/01/24 10:47:01 jonas@stripped +1 -3
    err is already negative

  storage/ndb/include/kernel/signaldata/Extent.hpp
    1.2 06/01/24 10:47:01 jonas@stripped +1 -1
    Set correct error code

# 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/mysql-5.1-new

--- 1.1/storage/ndb/include/kernel/signaldata/Extent.hpp	2005-11-07 12:19:11 +01:00
+++ 1.2/storage/ndb/include/kernel/signaldata/Extent.hpp	2006-01-24 10:47:01 +01:00
@@ -32,7 +32,7 @@
 
   enum ErrorCode {
     UnmappedExtentPageIsNotImplemented = 1,
-    NoExtentAvailable = 2
+    NoExtentAvailable = 1601
   };
   
   union 

--- 1.3/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp	2006-01-11 09:26:03 +01:00
+++ 1.4/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp	2006-01-24 10:47:01 +01:00
@@ -270,11 +270,9 @@
 
       if ((err= tsman.alloc_extent(&ext.p->m_key)) < 0)
       {
-	//XXX
 	c_extent_pool.release(ext);
 	c_page_request_pool.release(req);
-	ndbout_c("no free extent");
-	return -err;
+	return err;
       }
       
       int pages= err;

--- 1.27/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2006-01-11 23:49:47 +01:00
+++ 1.28/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2006-01-24 10:47:01 +01:00
@@ -1439,6 +1439,7 @@
     int ret= disk_page_prealloc(signal, fragPtr, &tmp, size);
     if (unlikely(ret < 0))
     {
+      terrorCode = -ret;
       goto disk_prealloc_error;
     }
     

--- 1.48/storage/ndb/src/ndbapi/ndberror.c	2006-01-20 11:05:00 +01:00
+++ 1.49/storage/ndb/src/ndbapi/ndberror.c	2006-01-24 10:47:01 +01:00
@@ -80,6 +80,7 @@
  * 1300 - BACKUP
  * 1400 - SUMA
  * 1500 - LGMAN
+ * 1600 - TSMAN
  * 4000 - API
  * 4100 - ""
  * 4200 - ""
@@ -197,7 +198,8 @@
   { 903,  HA_ERR_INDEX_FILE_FULL, IS, "Too many ordered indexes (increase MaxNoOfOrderedIndexes)" },
   { 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" },
+  
   /**
    * TimeoutExpired 
    */