Commit c9b29c6c authored by unknown's avatar unknown
Browse files

Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 

into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
parents e11871d8 726a63b0

storage/ndb/include/util/UtilBuffer.hpp

+6 −2
Original line number Diff line number Diff line
@@ -73,11 +73,15 @@ public: 
  }

  

  int assign(const void * d, size_t l) {

    if (data) free(data);

    /* Free the old data only after copying, in case d==data. */

    void *old_data= data;

    data = NULL;

    len = 0;

    alloc_size = 0;

    return append(d, l);

    int ret= append(d, l);

    if (old_data)

      free(old_data);

    return ret;

  }



  void clear() {

storage/ndb/src/common/util/SimpleProperties.cpp

+2 −2
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ SimpleProperties::pack(Writer & it, const void * __src, 
      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, const void * __src, 
    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);