bk commit into 6.0 tree (jas:1.2814)

[U-ROWVWADEjas]

Below is the list of changes that have just been committed into a local
6.0 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, 2008-02-14 15:44:42-05:00, jas@rowvwade. +2 -0
  Fix a couple of Netfrastructure build/default problems.  No
  effect at all on the Falcon build.

  storage/falcon/Configuration.cpp@stripped, 2008-02-14 15:44:33-05:00, jas@rowvwade. +3 -0
    Reset Netfrastructure lock timeout default (actually just
    setting) to zero.

  storage/falcon/IO.cpp@stripped, 2008-02-14 15:44:33-05:00, jas@rowvwade. +6 -0
    Force Netfrastructure build to HAVE_PREAD for Linux.

diff -Nrup a/storage/falcon/Configuration.cpp b/storage/falcon/Configuration.cpp
--- a/storage/falcon/Configuration.cpp	2008-02-13 15:22:31 -05:00
+++ b/storage/falcon/Configuration.cpp	2008-02-14 15:44:33 -05:00
@@ -69,7 +69,9 @@ extern uint64		falcon_page_cache_size;
 extern char*		falcon_checkpoint_schedule;
 extern char*		falcon_scavenge_schedule;
 extern char*		falcon_serial_log_dir;
+
 #else
+
 #define CONFIG_FILE	"netfraserver.conf"
 #define PARAMETER_UINT(_name, _text, _min, _default, _max, _flags, _update_function) \
 	uint falcon_##_name = _default;
@@ -168,6 +170,7 @@ Configuration::Configuration(const char 
 	indexChillThreshold			= 4 * ONE_MB;
 	recordChillThreshold		= 5 * ONE_MB;
 	maxTransactionBacklog		= MAX_TRANSACTION_BACKLOG;
+	falcon_lock_wait_timeout	= 0;
 #endif
 
 	maxMemoryAddress = max_memory_address;
diff -Nrup a/storage/falcon/IO.cpp b/storage/falcon/IO.cpp
--- a/storage/falcon/IO.cpp	2008-01-31 14:25:43 -05:00
+++ b/storage/falcon/IO.cpp	2008-02-14 15:44:33 -05:00
@@ -85,6 +85,12 @@
 #include "Debug.h"
 #include "Synchronize.h"
 
+#ifndef STORAGE_ENGINE
+#ifndef _WINDOWS
+#define HAVE_PREAD
+#endif
+#endif
+
 #define TRACE_FILE							"io.trace"
 //#define SIMULATE_DISK_FULL					1000000;