database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-30 11:22:14 +03:00
Code Activity

Merge ymer.(none):/usr/local/mysql/mysql-4.1-ndb.tmp

Browse Source 
into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
This commit is contained in:
knielsen@ymer.(none)
2006-10-25 10:44:22 +02:00
parent d9d7c7859a 44aa0f4de1
commit e43c5fca48
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
storage/ndb/include/util/UtilBuffer.hpp
View File

@@ -73,11 +73,15 @@ public:
} }
int assign(const void * d, size_t l) { 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; data = NULL;
len = 0; len = 0;
alloc_size = 0; alloc_size = 0;
return append(d, l); int ret= append(d, l);
if (old_data)
free(old_data);
return ret;
} }
void clear() { void clear() {

4
storage/ndb/src/common/util/SimpleProperties.cpp
View File

@@ -267,7 +267,7 @@ SimpleProperties::pack(Writer & it, const void * __src,
const char * src_len = _src + _map[i].Length_Offset; const char * src_len = _src + _map[i].Length_Offset;
Uint32 len = *((Uint32*)src_len); Uint32 len = *((Uint32*)src_len);
if(!ignoreMinMax){ if(!ignoreMinMax){
if(len == _map[i].maxValue) if(len > _map[i].maxValue)
return ValueTooHigh; return ValueTooHigh;
} }
ok = it.add(_map[i].Key, src, len); ok = it.add(_map[i].Key, src, len);
@@ -276,7 +276,7 @@ SimpleProperties::pack(Writer & it, const void * __src,
case SimpleProperties::StringValue: case SimpleProperties::StringValue:
if(!ignoreMinMax){ if(!ignoreMinMax){
size_t len = strlen(src); size_t len = strlen(src);
if(len == _map[i].maxValue) if(len > _map[i].maxValue)
return ValueTooHigh; return ValueTooHigh;
} }
ok = it.add(_map[i].Key, src); ok = it.add(_map[i].Key, src);