List:Commits« Previous MessageNext Message »
From:knielsen Date:October 25 2006 8:45am
Subject:bk commit into 5.0 tree (knielsen:1.2275)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of knielsen. When knielsen 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, 2006-10-25 10:45:11+02:00, knielsen@ymer.(none) +1 -0
  Merge ymer.(none):/usr/local/mysql/mysql-4.1-ndb.tmp
  into  ymer.(none):/usr/local/mysql/mysql-5.0-ndb
  MERGE: 1.1616.2781.1

  ndb/src/common/util/SimpleProperties.cpp@stripped, 2006-10-25 10:45:07+02:00, knielsen@ymer.(none) +0 -0
    Auto merged
    MERGE: 1.5.1.1

# 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:	knielsen
# Host:	ymer.(none)
# Root:	/usr/local/mysql/mysql-5.0-ndb/RESYNC

--- 1.7/ndb/src/common/util/SimpleProperties.cpp	2006-10-25 10:45:16 +02:00
+++ 1.8/ndb/src/common/util/SimpleProperties.cpp	2006-10-25 10:45:16 +02:00
@@ -267,7 +267,7 @@ SimpleProperties::pack(Writer & it, cons
       const char * src_len = _src + _map[i].Length_Offset;
       Uint32 len = *((Uint32*)src_len);
       if(!ignoreMinMax){
-	if(len == _map[i].maxValue)
+	if(len > _map[i].maxValue)
 	  return ValueTooHigh;
       }
       ok = it.add(_map[i].Key, src, len);
@@ -276,7 +276,7 @@ SimpleProperties::pack(Writer & it, cons
     case SimpleProperties::StringValue:
       if(!ignoreMinMax){
 	size_t len = strlen(src);
-	if(len == _map[i].maxValue)
+	if(len > _map[i].maxValue)
 	  return ValueTooHigh;
       }
       ok = it.add(_map[i].Key, src);
Thread
bk commit into 5.0 tree (knielsen:1.2275)knielsen25 Oct