MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:jonas Date:April 21 2006 12:16pm
Subject:bk commit into 5.1 tree (jonas:1.2379)
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.2379 06/04/21 14:15:54 jonas@stripped +1 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/51-work
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.126 06/04/21 14:15:50 jonas@stripped +0 -0
    Auto merged

# 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-ndb/RESYNC

--- 1.125/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2006-04-21 01:56:07 +02:00
+++ 1.126/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2006-04-21 14:15:50 +02:00
@@ -4410,7 +4410,7 @@
   ptr[0].p = (Uint32*)m_buffer.get_data();
   ptr[0].sz = m_buffer.length() / 4;
 
-  int err[] = { CreateFileRef::Busy, 0};
+  int err[] = { CreateFileRef::Busy, CreateFileRef::NotMaster, 0};
   /*
     Send signal without time-out since creating files can take a very long
     time if the file is very big.
@@ -4454,7 +4454,7 @@
   req->file_id = file.m_id;
   req->file_version = file.m_version;
 
-  int err[] = { DropFileRef::Busy, 0};
+  int err[] = { DropFileRef::Busy, DropFileRef::NotMaster, 0};
   DBUG_RETURN(dictSignal(&tSignal, 0, 0,
 	                 0, // master
 		         WAIT_CREATE_INDX_REQ,
Thread
bk commit into 5.1 tree (jonas:1.2379)jonas21 Apr