bk commit into 6.0-falcon tree (jas:1.2572)

[U-ROWVWADEjas]

Below is the list of changes that have just been committed into a local
6.0-falcon repository of . When  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-28 12:10:09-04:00, jas@rowvwade. +4 -0
  Fix for Falcon bug 29319

  storage/falcon/Database.cpp@stripped, 2007-06-28 12:10:00-04:00, jas@rowvwade. +0 -1
    Eliminate redundant system tranaction commit.

  storage/falcon/Engine.dsp@stripped, 2007-06-28 12:10:01-04:00, jas@rowvwade. +16 -0
    Bring up to rev (this shouldn't really be in bitkeeper).

  storage/falcon/StorageDatabase.cpp@stripped, 2007-06-28 12:10:01-04:00, jas@rowvwade. +4 -0
    Break out of StorageDatabase::makeKey if it sees a null value.

  storage/falcon/Thread.cpp@stripped, 2007-06-28 12:10:01-04:00, jas@rowvwade. +9 -2
    Eliminate Netfrastructure build stuff from Falcon thread print.

# 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:	jas
# Host:	rowvwade.
# Root:	D:/MySQL/mysql-5.1-falcon

--- 1.1/storage/falcon/Engine.dsp	2007-06-28 12:10:33 -04:00
+++ 1.2/storage/falcon/Engine.dsp	2007-06-28 12:10:33 -04:00
@@ -2077,6 +2077,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=.\SRLCreateTableSpace.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\SRLData.h
 # End Source File
 # Begin Source File
@@ -2097,6 +2101,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=.\SRLDropTableSpace.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\SRLFreePage.h
 # End Source File
 # Begin Source File
@@ -3698,7 +3706,15 @@
 # End Source File
 # Begin Source File
 
+SOURCE=.\SRLCreateTableSpace.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\SRLDeleteIndex.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\SRLDropTableSpace.cpp
 # End Source File
 # Begin Source File
 

--- 1.81/storage/falcon/Database.cpp	2007-06-28 12:10:33 -04:00
+++ 1.82/storage/falcon/Database.cpp	2007-06-28 12:10:33 -04:00
@@ -1434,7 +1434,6 @@
 	sync.unlock();
 	table->drop(transaction);
 	table->expunge(getSystemTransaction());
-	commitSystemTransaction();
 	delete table;
 }
 

--- 1.74/storage/falcon/StorageDatabase.cpp	2007-06-28 12:10:33 -04:00
+++ 1.75/storage/falcon/StorageDatabase.cpp	2007-06-28 12:10:33 -04:00
@@ -658,13 +658,17 @@
 			int len = getSegmentValue(segment, p, values[segmentNumber], index->fields[segmentNumber]);
 			
 			if (nullFlag)
+				{
 				values[segmentNumber]->setNull();
+				break;
+				}
 
 			p += len;
 			}
 
 		index->makeKey(segmentNumber, values, &storageKey->indexKey);
 		storageKey->numberSegments = segmentNumber;
+		
 		return 0;
 		}
 	catch (SQLError&)

--- 1.25/storage/falcon/Thread.cpp	2007-06-28 12:10:33 -04:00
+++ 1.26/storage/falcon/Thread.cpp	2007-06-28 12:10:33 -04:00
@@ -111,6 +111,8 @@
 	where = NULL;
 	pageMarks = 0;
 	lockGranted = false;
+	prior = NULL;
+	next = NULL;
 }
 
 Thread::~Thread()
@@ -406,10 +408,15 @@
 
 void Thread::print()
 {
-	LOG_DEBUG ("  Thread %lx (%d) sleep=%d, grant=%d, locks=%d, who %d, javaThread %lx\n"
-			   "      prior=%lx, next=%lx, parent=%lx\n",
+#ifdef STORAGE_ENGINE
+	LOG_DEBUG ("  Thread %p (%d) sleep=%d, grant=%d, locks=%d, who %d, parent=%p\n",
+				this, threadId, sleeping, lockGranted, activeLocks, lockGranted, threadBarn);
+#else
+	LOG_DEBUG ("  Thread %p (%d) sleep=%d, grant=%d, locks=%d, who %d, javaThread %p\n"
+			   "      prior=%p, next=%p, parent=%p\n",
 				this, threadId, sleeping, lockGranted, activeLocks, lockGranted, javaThread,
 				prior, next, threadBarn);
+#endif
 
 	for (Sync *sync = locks; sync; sync = sync->prior)
 		sync->print ("    Holding");