diff options
| author | unknown <konstantin@bodhi.netgear> | 2006-07-06 22:55:48 +0400 |
|---|---|---|
| committer | unknown <konstantin@bodhi.netgear> | 2006-07-06 22:55:48 +0400 |
| commit | df9b4754b7680fae685d34a9ed1210452f6f8088 (patch) | |
| tree | a054d3ff659c59af94637b315fc1234edc00dbcf /mysys/my_malloc.c | |
| parent | d2b4e9c8e22f3d06848701e8fa1e9c800c471960 (diff) | |
| parent | 7982816b8adac32e055849f0e8d15a973889ad1d (diff) | |
| download | mariadb-git-df9b4754b7680fae685d34a9ed1210452f6f8088.tar.gz | |
Merge bodhi.netgear:/opt/local/work/tmp_merge
into bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge-with-5.0
mysql-test/r/create.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.h:
Auto merged
sql/tztime.cc:
Auto merged
include/my_sys.h:
Manual merge (second attempt).
mysql-test/r/bdb.result:
Manual merge (second attempt).
mysql-test/t/bdb.test:
Manual merge (second attempt).
mysys/my_malloc.c:
Manual merge (second attempt).
mysys/safemalloc.c:
Manual merge (second attempt).
sql/ha_federated.cc:
Manual merge (second attempt).
sql/log_event.cc:
Manual merge (second attempt).
sql/set_var.cc:
Manual merge (second attempt).
sql/set_var.h:
Manual merge (second attempt).
sql/slave.cc:
Manual merge (second attempt).
sql/slave.h:
Manual merge (second attempt).
sql/sql_class.h:
Manual merge (second attempt).
sql/sql_table.cc:
Manual merge (second attempt).
sql/sql_udf.cc:
Manual merge (second attempt).
sql/sql_yacc.yy:
Manual merge (second attempt).
Diffstat (limited to 'mysys/my_malloc.c')
| -rw-r--r-- | mysys/my_malloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_malloc.c b/mysys/my_malloc.c index 3fb3866f79c..9dd5530bd28 100644 --- a/mysys/my_malloc.c +++ b/mysys/my_malloc.c @@ -83,7 +83,7 @@ char *my_strdup(const char *from, myf my_flags) } -char *my_strndup(const byte *from, uint length, myf my_flags) +char *my_strndup(const char *from, uint length, myf my_flags) { gptr ptr; if ((ptr=my_malloc(length+1,my_flags)) != 0) |