1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-29 00:08:14 +03:00

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

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
2 changed files with 8 additions and 4 deletions

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() {