diff options
| author | unknown <serg@serg.mylan> | 2005-01-24 15:50:13 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-01-24 15:50:13 +0100 |
| commit | ba3b78d968c56806d8606e47bc4555a8436004c6 (patch) | |
| tree | 8f16454d52b7844621e51a609323f1638a14e22e /ndb | |
| parent | 343e9bbd34ecd89deb7d28214e23171894b8b2a0 (diff) | |
| parent | 8bdb500105f97e3007e652f73d99c373d38f2aad (diff) | |
| download | mariadb-git-ba3b78d968c56806d8606e47bc4555a8436004c6.tar.gz | |
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
mysys/mf_keycache.c:
Auto merged
sql/item.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/common/util/strdup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ndb/src/common/util/strdup.c b/ndb/src/common/util/strdup.c index afe2306427e..d8f4d99bd28 100644 --- a/ndb/src/common/util/strdup.c +++ b/ndb/src/common/util/strdup.c @@ -21,8 +21,8 @@ char * strdup(const char *s){ void *p2; - p2 = malloc(strlen(s)+1); - strcpy(p2, s); + if ((p2 = malloc(strlen(s)+1))) + strcpy(p2, s); return p2; } #endif |