diff options
| author | unknown <knielsen@rt.int.sifira.dk> | 2006-06-23 15:05:15 +0200 |
|---|---|---|
| committer | unknown <knielsen@rt.int.sifira.dk> | 2006-06-23 15:05:15 +0200 |
| commit | 83f16e31da4fac73343911c59ff8fef1b3dc556b (patch) | |
| tree | 70f9d8c45d74bad9cd3290e4ab9cec191f872d23 /mysys | |
| parent | 2deb5a611ab594d0601b2d3adbf67d5e9a2922ba (diff) | |
| parent | 46d19b740926d22ffa7bd3a89be81164d09b366d (diff) | |
| download | mariadb-git-83f16e31da4fac73343911c59ff8fef1b3dc556b.tar.gz | |
Merge mysql.com:/usr/local/mysql/mysql-5.1-vg-apr2
into mysql.com:/usr/local/mysql/tmp-5.1
server-tools/instance-manager/instance_options.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/rpl_injector.cc:
Auto merged
sql/rpl_injector.h:
Auto merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/mf_dirname.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysys/mf_dirname.c b/mysys/mf_dirname.c index 378fe7080b8..43fde95554a 100644 --- a/mysys/mf_dirname.c +++ b/mysys/mf_dirname.c @@ -72,7 +72,9 @@ uint dirname_part(my_string to, const char *name) SYNPOSIS convert_dirname() - to Store result here + to Store result here. Must be at least of size + min(FN_REFLEN, strlen(from) + 1) to make room + for adding FN_LIBCHAR at the end. from Original filename. May be == to from_end Pointer at end of filename (normally end \0) |