summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorreggie@mdk10.(none) <>2005-05-23 12:05:15 -0500
committerreggie@mdk10.(none) <>2005-05-23 12:05:15 -0500
commit1c0da6110ea539fda524b941c32f20fafcbf0f24 (patch)
tree3c59f5c05e59aa01beb0093d7df7dda41ec2a49d /strings
parentc9e7c0fd56e04ce15b09b44c927c221143c6a9b6 (diff)
downloadmariadb-git-1c0da6110ea539fda524b941c32f20fafcbf0f24.tar.gz
BUG# 10687: Merge engine fails under Windows
This cset is to roll out the cset applied earlier from Ingo. This bug has been fixed with a different cset.
Diffstat (limited to 'strings')
-rw-r--r--strings/my_vsnprintf.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/strings/my_vsnprintf.c b/strings/my_vsnprintf.c
index d92b291321b..d0e529288f7 100644
--- a/strings/my_vsnprintf.c
+++ b/strings/my_vsnprintf.c
@@ -28,7 +28,6 @@
%#[l]u
%#[l]x
%#.#s Note first # is ignored
- %c
RETURN
length of result string
@@ -121,11 +120,6 @@ int my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap)
to+= res_length;
continue;
}
- else if (*fmt == 'c')
- {
- *(to++)= (char) va_arg(ap, int);
- continue;
- }
/* We come here on '%%', unknown code or too long parameter */
if (to == end)
break;