bk commit into 6.0 tree (jas:1.2590)

[U-ROWVWADEjas]

Below is the list of changes that have just been committed into a local
6.0 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, 2008-03-13 10:27:03-04:00, jas@rowvwade. +2 -0
  Fix recently (re-)introduced MAC compilation problem.

  storage/falcon/DateTime.cpp@stripped, 2008-03-13 10:26:54-04:00, jas@rowvwade. +1 -2
    Fix recently (re-)introduced MAC compilation problem.

  storage/falcon/Scan.cpp@stripped, 2008-03-13 10:26:54-04:00, jas@rowvwade. +2 -1
    Fix buffer overflow parsing text search key.

diff -Nrup a/storage/falcon/DateTime.cpp b/storage/falcon/DateTime.cpp
--- a/storage/falcon/DateTime.cpp	2008-03-10 15:29:43 -04:00
+++ b/storage/falcon/DateTime.cpp	2008-03-13 10:26:54 -04:00
@@ -924,8 +924,7 @@ int64 DateTime::getSeconds(tm *time, con
 
 bool DateTime::isDayLightSavings(tm *time)
 {
-	//if (!time->tm_isdst)
-	if (!daylight)
+	if (!time->tm_isdst)
 		return false;
 
 	// Jan to March and November and December are definitely no
diff -Nrup a/storage/falcon/Scan.cpp b/storage/falcon/Scan.cpp
--- a/storage/falcon/Scan.cpp	2007-09-20 11:42:29 -04:00
+++ b/storage/falcon/Scan.cpp	2008-03-13 10:26:54 -04:00
@@ -317,11 +317,12 @@ int Scan::compare(int count, int32 * num
 void Scan::setKey(const char * word)
 {
 	UCHAR *p = key;
+	UCHAR *end = key + sizeof(key) - 1;
 	char c;
 	searchMask = 0;
 	rootEnd = NULL;
 
-	for (int n = 0; (c = word [n]); ++n)
+	for (int n = 0; p < end && (c = word [n]); ++n)
 		{
 		char c = word [n];