List:Commits« Previous MessageNext Message »
From:jonas Date:January 10 2006 7:08am
Subject:bk commit into 5.1 tree (jonas:1.1992)
View as plain text  
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.1992 06/01/10 08:08:48 jonas@stripped +1 -0
  ndb dd -
    Fix LCP of hash indexes (that was accidently broken by backup of dd objects)

  storage/ndb/src/kernel/blocks/backup/Backup.cpp
    1.32 06/01/10 08:08:45 jonas@stripped +5 -6
    Fix LCP of hash indexes

# 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-dd

--- 1.31/storage/ndb/src/kernel/blocks/backup/Backup.cpp	2006-01-06 18:35:08 +01:00
+++ 1.32/storage/ndb/src/kernel/blocks/backup/Backup.cpp	2006-01-10 08:08:45 +01:00
@@ -2850,6 +2850,9 @@
   signal->getSection(dictTabInfoPtr, GetTabInfoConf::DICT_TAB_INFO);
   ndbrequire(dictTabInfoPtr.sz == len);
 
+  TablePtr tabPtr ;
+  ndbrequire(findTable(ptr, tabPtr, tableId));
+
   /**
    * No of pages needed
    */
@@ -2901,11 +2904,9 @@
     return;
   }//if
 
-  TablePtr tabPtr ;
-  ndbrequire(findTable(ptr, tabPtr, tableId));
-
-  if (!DictTabInfo::isTable(tableType))
+  if (!DictTabInfo::isTable(tabPtr.p->tableType))
   {
+    jam();
     releaseSections(signal);
 
     TablePtr tmp = tabPtr;
@@ -2996,8 +2997,6 @@
   bool lcp = ptr.p->is_lcp();
 
   ndbrequire(tabPtr.p->tableId == tmpTab.TableId);
-  ndbrequire(DictTabInfo::isTable(tabPtr.p->tableType));
-  ndbrequire(DictTabInfo::isTable(tmpTab.TableType));
   ndbrequire(lcp || (tabPtr.p->tableType == tmpTab.TableType));
   
   /**
Thread
bk commit into 5.1 tree (jonas:1.1992)jonas10 Jan