diff options
author | unknown <reggie@mdk10.(none)> | 2005-05-23 12:55:39 -0500 |
---|---|---|
committer | unknown <reggie@mdk10.(none)> | 2005-05-23 12:55:39 -0500 |
commit | b096c34d9220c0d892716befef6be5d9b1393dde (patch) | |
tree | fdf4ef1c0fd648f3c53d65cdd4fb1e34a004c4b6 /strings/my_vsnprintf.c | |
parent | c273526d85d26be7c31f28da0174f67b08aef9c8 (diff) | |
parent | 67c5514b908a6adfb0cd91dfe6dc9d0b0e21e1c1 (diff) | |
download | mariadb-git-b096c34d9220c0d892716befef6be5d9b1393dde.tar.gz |
merged changes from 4.1
include/my_global.h:
Auto merged
ndb/src/cw/cpcd/Process.cpp:
Auto merged
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
Auto merged
strings/my_vsnprintf.c:
Auto merged
Diffstat (limited to 'strings/my_vsnprintf.c')
-rw-r--r-- | strings/my_vsnprintf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/strings/my_vsnprintf.c b/strings/my_vsnprintf.c index 935cc2d380d..0e036c2bbcd 100644 --- a/strings/my_vsnprintf.c +++ b/strings/my_vsnprintf.c @@ -28,7 +28,7 @@ %#[l]u %#[l]x %#.#s Note first # is ignored - + RETURN length of result string */ |