database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +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


storage/ndb/include/util/UtilBuffer.hpp:
  Auto merged
storage/ndb/src/common/util/SimpleProperties.cpp:
  Auto merged
This commit is contained in:
unknown
2006-10-25 10:44:22 +02:00
parent 0ab6fd5f3e c6ca641a6b
commit 726a63b03c
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) {
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() {