bk commit into 5.1 tree (mronstrom:1.1886)

[mikael]

Below is the list of changes that have just been committed into a local
5.1 repository of mikron. When mikron 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.1886 05/07/18 09:57:14 mronstrom@stripped +2 -0
  Temporary solution for restore to always use previous default
  fragmentation.
  For UserDefined partitioning restore won't work yet.

  storage/ndb/tools/restore/Restore.cpp
    1.28 05/07/18 09:57:05 mronstrom@stripped +1 -0
    Temporary solution for restore to always use previous default
    fragmentation.
    For UserDefined partitioning restore won't work yet.

  storage/ndb/include/kernel/signaldata/CreateFragmentation.hpp
    1.6 05/07/18 09:57:05 mronstrom@stripped +5 -5
    Move error codes to new region of numbers to avoid duplication
    of error codes meaning different things

# 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:	mronstrom
# Host:	c-7008e253.1238-1-64736c10.cust.bredbandsbolaget.se
# Root:	/Users/mikron/wl1354

--- 1.5/storage/ndb/include/kernel/signaldata/CreateFragmentation.hpp	2005-07-14 13:52:23 +02:00
+++ 1.6/storage/ndb/include/kernel/signaldata/CreateFragmentation.hpp	2005-07-18 09:57:05 +02:00
@@ -61,11 +61,11 @@
  
   enum ErrorCode {
     OK = 0
-    ,InvalidFragmentationType = 1
-    ,InvalidNodeId = 2
-    ,InvalidNodeType = 3
-    ,InvalidPrimaryTable = 4
-    ,InvalidNodeGroup = 5
+    ,InvalidFragmentationType = 1301
+    ,InvalidNodeId = 1302
+    ,InvalidNodeType = 1303
+    ,InvalidPrimaryTable = 1304
+    ,InvalidNodeGroup = 1305
   };
  
 private:

--- 1.27/storage/ndb/tools/restore/Restore.cpp	2005-07-13 22:33:47 +02:00
+++ 1.28/storage/ndb/tools/restore/Restore.cpp	2005-07-18 09:57:05 +02:00
@@ -227,6 +227,7 @@
 
   debug << "parseTableInfo " << tableImpl->getName() << " done" << endl;
   tableImpl->m_ng.clear();
+  tableImpl->m_fragmentType = NdbDictionary::Object::FragAllSmall;
   TableS * table = new TableS(m_fileHeader.NdbVersion, tableImpl);
   if(table == NULL) {
     return false;