diff options
| author | unknown <tnurnberg@mysql.com/white.intern.koehntopp.de> | 2007-12-17 09:13:38 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@mysql.com/white.intern.koehntopp.de> | 2007-12-17 09:13:38 +0100 |
| commit | 02cdb7eccab6fe262d4a9d430f9d23eb51ac4839 (patch) | |
| tree | d9da04544a6b5068bf1a6d8cbd638b7563676d41 /mysys | |
| parent | 1c72446ef69cf6c50cf9b2dae69b2b24a7576103 (diff) | |
| parent | 0805384869656fc9efaa28de331e825aa8b885d7 (diff) | |
| download | mariadb-git-02cdb7eccab6fe262d4a9d430f9d23eb51ac4839.tar.gz | |
Merge mysql.com:/misc/mysql/31752_/41-31752_
into mysql.com:/misc/mysql/31752_/50-31752_
mysys/mf_pack.c:
Auto merged
sql/log.cc:
Auto merged
sql/sql_show.cc:
manual merge
sql/unireg.cc:
manual merge
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/mf_pack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/mf_pack.c b/mysys/mf_pack.c index d14c24f35d7..9e8b6516f63 100644 --- a/mysys/mf_pack.c +++ b/mysys/mf_pack.c @@ -271,7 +271,7 @@ void symdirget(char *dir) SYNOPSIS unpack_dirname() - to Store result here. May be = from + to result-buffer, FN_REFLEN characters. may be == from from 'Packed' directory name (may contain ~) IMPLEMENTATION @@ -397,7 +397,7 @@ uint unpack_filename(my_string to, const char *from) /* Convert filename (unix standard) to system standard */ /* Used before system command's like open(), create() .. */ - /* Returns length of to */ + /* Returns used length of to; total length should be FN_REFLEN */ uint system_filename(my_string to, const char *from) { |