bk commit into 6.0-falcon tree (hakank:1.2542)

[Hakan Kuecuekilmaz]

Below is the list of changes that have just been committed into a local
6.0-falcon repository of hakan. When hakan 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, 2007-06-05 11:56:04+02:00, hakank@stripped +4 -0
  Merge au0012.local:/Users/hakan/work/mysql/mysql-5.1-falcon-local-master
  into  au0012.local:/Users/hakan/work/mysql/mysql-5.1-falcon
  MERGE: 1.2475.65.1

  storage/falcon/MACAddress.cpp@stripped, 2007-06-05 11:55:57+02:00, hakank@stripped +0 -0
    Auto merged
    MERGE: 1.4.1.1

  storage/falcon/MemMgr.cpp@stripped, 2007-06-05 11:55:57+02:00, hakank@stripped +0 -0
    Auto merged
    MERGE: 1.24.1.1

  storage/falcon/Stream.cpp@stripped, 2007-06-05 11:55:57+02:00, hakank@stripped +0 -0
    Auto merged
    MERGE: 1.5.1.1

  storage/falcon/Thread.cpp@stripped, 2007-06-05 11:55:57+02:00, hakank@stripped +0 -0
    Auto merged
    MERGE: 1.22.1.2

# 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:	hakank
# Host:	au0012.local
# Root:	/Users/hakan/work/mysql/mysql-5.1-falcon/RESYNC

--- 1.5/storage/falcon/MACAddress.cpp	2007-05-24 00:39:46 +02:00
+++ 1.6/storage/falcon/MACAddress.cpp	2007-06-05 11:55:57 +02:00
@@ -50,7 +50,7 @@ static const char *devices [] = { 
 #endif
 
 static int count = MACAddress::getAddresses();
-static QUAD macAddresses [MAX_ADDRESSES];
+static int64 macAddresses [MAX_ADDRESSES];
 static const char *hexDigits = "0123456789ABCDEF";
 
 //////////////////////////////////////////////////////////////////////
@@ -108,9 +108,9 @@ int MACAddress::getAddresses()
 	return count;
 }
 
-QUAD MACAddress::getAddress(int length, UCHAR *bytes)
+int64 MACAddress::getAddress(int length, UCHAR *bytes)
 {
-	QUAD address = 0;
+	int64 address = 0;
 
 	for (int n = 0; n < length; ++n)
 		address = address << 8 | bytes [n];
@@ -123,14 +123,14 @@ int MACAddress::getAddressCount()
 	return count;
 }
 
-QUAD MACAddress::getAddress(int index)
+int64 MACAddress::getAddress(int index)
 {
 	return (index < 0 || index >= count) ? 0 : macAddresses [index];
 }
 
-QUAD MACAddress::getAddress(const char *string)
+int64 MACAddress::getAddress(const char *string)
 {
-	QUAD address = 0;
+	int64 address = 0;
 
 	for (const char *p = string; *p;)
 		{
@@ -161,7 +161,7 @@ int MACAddress::getHexDigit(char c)
 	return -1;
 }
 
-bool MACAddress::isAddress(QUAD address)
+bool MACAddress::isAddress(int64 address)
 {
 	for (int n = 0; n < count; ++n)
 		if (address == macAddresses [n])
@@ -170,7 +170,7 @@ bool MACAddress::isAddress(QUAD address)
 	return false;
 }
 
-JString MACAddress::getAddressString(QUAD address)
+JString MACAddress::getAddressString(int64 address)
 {
 	char string [32];
 	char *p = string;

--- 1.25/storage/falcon/MemMgr.cpp	2007-05-24 00:39:46 +02:00
+++ 1.26/storage/falcon/MemMgr.cpp	2007-06-05 11:55:57 +02:00
@@ -790,6 +790,11 @@ void MemMgr::validate()
 void MemMgr::analyze(int mask, Stream *stream, InfoTable *summaryTable, InfoTable *detailTable)
 {
 #ifdef STORAGE_ENGINE
+	Sync sync (&mutex, "MemMgr::analyze");
+	
+	if (summaryTable || detailTable)
+		sync.lock(Exclusive);
+		
 	Client *hashTable [CLIENT_HASH_SIZE];
 	memset (hashTable, 0, sizeof (hashTable));
 	UCHAR *memory = (UCHAR*) malloc (sizeof(Client) * MAX_CLIENTS);
@@ -798,7 +803,6 @@ void MemMgr::analyze(int mask, Stream *s
 	int l = ROUNDUP(sizeof (MemSmallHunk), sizeof (double));
 	Client *client;
 	Client totals;
-
 
 	for (MemSmallHunk *smallHunk = smallHunks; smallHunk; smallHunk = smallHunk->nextHunk)
 		{

--- 1.6/storage/falcon/Stream.cpp	2007-05-24 00:39:46 +02:00
+++ 1.7/storage/falcon/Stream.cpp	2007-06-05 11:55:57 +02:00
@@ -238,7 +238,7 @@ int Stream::getSegment(int offset, int l
 void Stream::putSegment(const char * string)
 {
 	if (string [0])
-		putSegment (strlen (string), string, true);
+		putSegment((int) strlen (string), string, true);
 }
 
 char* Stream::getString()
@@ -269,10 +269,10 @@ void Stream::compress(int length, void *
 			   ((p >= yellow) || (p [0] != p [1] || p [1] != p [2])))
 			*q++ = *p++;
 
-		int n = q - start;
+		IPTR n = q - start;
 
 		if (n)
-			start [-1] = -n;
+			start [-1] = (short) -n;
 		else
 			--q;
 
@@ -285,11 +285,11 @@ void Stream::compress(int length, void *
 			++p;
 
 		n = p - start;
-		*q++ = n;
+		*q++ = (short) n;
 		*q++ = *start;
 		}
 
-	totalLength = segment->length = (char*) q - segment->address;
+	totalLength = segment->length = (int) ((char*) q - segment->address);
 }
 
 char* Stream::decompress(int tableId, int recordNumber)

--- 1.23/storage/falcon/Thread.cpp	2007-05-24 00:39:46 +02:00
+++ 1.24/storage/falcon/Thread.cpp	2007-06-05 11:55:57 +02:00
@@ -123,7 +123,6 @@ Thread::~Thread()
 	ASSERT(activeLocks == 0);
 	ASSERT(!lockPending);
 	ASSERT(!locks);
-	ASSERT(!syncWait);
 	ASSERT(!threadBarn);
 	ASSERT(!pageMarks);
 	
@@ -416,9 +415,6 @@ void Thread::print()
 
 	if (lockPending)
 		lockPending->print ("    Pending");
-
-	if (syncWait)
-		syncWait->print ("    Waiting");
 }
 
 /***