mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
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. sql/ha_myisammrg.cc: removed the patch applied earlier strings/my_vsnprintf.c: removed the patch applied earlier. The patch was to add %c ability. Monty has already done this.
This commit is contained in:
@ -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;
|
||||
|
Reference in New Issue
Block a user