bk commit into 5.1 tree (jonas:1.2275) BUG#16310

[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@stripped, 2006-08-21 14:09:50+02:00, jonas@stripped +2 -0
  ndb - bug#16310
    better error message for creating table with non-existing tablespace

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp@stripped, 2006-08-21 14:09:48+02:00,
jonas@stripped +3 -0
    better error reporting

  storage/ndb/src/ndbapi/ndberror.c@stripped, 2006-08-21 14:09:48+02:00,
jonas@stripped +1 -1
    better error reporting

# 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.147/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2006-08-21 14:09:54 +02:00
+++ 1.148/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2006-08-21 14:09:54 +02:00
@@ -2600,6 +2600,9 @@
     else 
     {
       // error set by get filegroup
+      if (m_error.code == 723)
+	m_error.code = 755;
+      
       NdbMem_Free((void*)tmpTab);
       DBUG_RETURN(-1);
     }

--- 1.69/storage/ndb/src/ndbapi/ndberror.c	2006-08-21 14:09:54 +02:00
+++ 1.70/storage/ndb/src/ndbapi/ndberror.c	2006-08-21 14:09:54 +02:00
@@ -376,7 +376,7 @@
   { 752,  DMEC, SE, "Invalid file format" },
   { 753,  IE, SE, "Invalid filegroup for file" },
   { 754,  IE, SE, "Invalid filegroup version when creating file" },
-  { 755,  DMEC, SE, "Invalid tablespace" },
+  { 755,  HA_WRONG_CREATE_OPTION, SE, "Invalid tablespace" },
   { 756,  DMEC, SE, "Index on disk column is not supported" },
   { 757,  DMEC, SE, "Varsize bitfield not supported" },
   { 758,  DMEC, SE, "Tablespace has changed" },