Below is the list of changes that have just been committed into a local
5.1-ndb 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/in...urce-tree.html

ChangeSet
1.1837 05/04/11 15:43:33 joreland (AT) mysql (DOT) com +1 -0
ndb diskdata
Backup/drop table bug fix

ndb/src/kernel/blocks/backup/Backup.cpp
1.27 05/04/11 15:43:30 joreland (AT) mysql (DOT) com +11 -6
Backup/drop table bug fix

# 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: joreland
# Host: eel.ndb.mysql.com.ndb.mysql.com.ndb.mysql.com.ndb. mysql.com
# Root: /home/jonas/src/mysql-5.1-ndb-dd

--- 1.26/ndb/src/kernel/blocks/backup/Backup.cpp Mon Apr 11 11:20:25 2005
+++ 1.27/ndb/src/kernel/blocks/backup/Backup.cpp Mon Apr 11 15:43:30 2005
@@ -2344,6 +2344,7 @@
TablePtr tabPtr;
FragmentPtr fragPtr;

+ ptr.p->setErrorCode(errCode);
ndbrequire(ptr.p->tables.first(tabPtr));
tabPtr.p->fragments.getPtr(fragPtr, 0);

@@ -2355,10 +2356,6 @@
ref->errorCode = errCode;
sendSignal(ptr.p->masterRef, GSN_LCP_PREPARE_REF,
signal, LcpPrepareRef::SignalLength, JBB);
-
- tabPtr.p->attributes.release();
- tabPtr.p->fragments.release();
- ptr.p->tables.release();
}
}

@@ -4791,9 +4788,10 @@
tabPtr.p->attributes.release();
tabPtr.p->fragments.release();
ptr.p->tables.release();
+ ptr.p->errorCode = 0;
}

- if(ptr.p->tables.first(tabPtr))
+ if(ptr.p->tables.first(tabPtr) && ptr.p->errorCode == 0)
{
FragmentPtr fragPtr;
tabPtr.p->fragments.getPtr(fragPtr, 0);
@@ -4802,7 +4800,7 @@
lcp_open_file_done(signal, ptr);
return;
}
- else
+ else if(ptr.p->errorCode == 0)
{
FragmentPtr fragPtr;
if(!ptr.p->tables.seize(tabPtr) || !tabPtr.p->fragments.seize(1))
@@ -4818,6 +4816,13 @@
fragPtr.p->scanned = 0;
fragPtr.p->scanning = 0;
fragPtr.p->tableId = req.tableId;
+ }
+ else
+ {
+ tabPtr.p->fragments.getPtr(fragPtr, 0);
+ fragPtr.p->fragmentId = req.fragmentId;
+ defineBackupRef(signal, ptr, ptr.p->errorCode);
+ return;
}

if(first)

--
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe: http://lists.mysql.com/internals?uns...ie.nctu.edu.tw