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

[Jim Starkey]

Below is the list of changes that have just been committed into a local
6.0-falcon repository of jas. When jas 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-26 13:36:29-04:00, jas@stripped +2 -0
  Commented out periodic database "sync" operation pending
  additional study.  Also shortened the time that 
  Section::updateRecord holds exclusive lock during delete
  operation.

  storage/falcon/Database.cpp@stripped, 2007-06-26 13:36:21-04:00,
jas@stripped +7 -0
    Turn off database file sync.

  storage/falcon/Section.cpp@stripped, 2007-06-26 13:36:21-04:00,
jas@stripped +3 -2
    Lock Section object for minimim amount of time.

# 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:	fluffy.netfrastructure.com
# Root:	/home/mysql/mysql-5.1-falcon

--- 1.80/storage/falcon/Database.cpp	2007-06-26 13:36:36 -04:00
+++ 1.81/storage/falcon/Database.cpp	2007-06-26 13:36:36 -04:00
@@ -2298,6 +2298,13 @@
 
 void Database::sync(void)
 {
+	/***
+	time_t before = DateTime::getNow();
 	dbb->sync();
 	tableSpaceManager->sync();
+	time_t delta = DateTime::getNow() - before;
+
+	if (delta)
+		Log::debug("Disk sync time: %d seconds\n", delta);
+	***/
 }

--- 1.55/storage/falcon/Section.cpp	2007-06-26 13:36:36 -04:00
+++ 1.56/storage/falcon/Section.cpp	2007-06-26 13:36:36 -04:00
@@ -438,11 +438,12 @@
 	// Do some fancy accounting to avoid premature use of record number.
 	// If the record number has been reserved, don't bother to delete it.
 
-	Sync sync (&syncObject, "Section::updateRecord");
-	sync.lock (Exclusive);
 
 	if (!stream)
 		{
+		Sync sync (&syncInsert, "Section::updateRecord");
+		sync.lock (Exclusive);
+
 		if (!reservedRecordNumbers)
 			reservedRecordNumbers = new Bitmap;