summaryrefslogtreecommitdiff
path: root/strings/strxmov.c
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2010-08-27 17:12:44 +0300
committerMichael Widenius <monty@askmonty.org>2010-08-27 17:12:44 +0300
commitad6d95d3cb420557cfc7efa658181a8d20b4c154 (patch)
tree984bb45ca187a6cc38c7132a9600d91515df564e /strings/strxmov.c
parent9bc9855c16f815e71223398ef17cd6052becc44e (diff)
parent7909541953de43c7b7d16513c8d612cfe405af67 (diff)
downloadmariadb-git-ad6d95d3cb420557cfc7efa658181a8d20b4c154.tar.gz
Merge with MySQL 5.1.50
- Changed to still use bcmp() in certain cases becasue - Faster for short unaligneed strings than memcmp() - Bettern when using valgrind - Changed to use my_sprintf() instead of sprintf() to get higher portability for old systems - Changed code to use MariaDB version of select->skip_record() - Removed -%::SCCS/s.% from Makefile.am:s to remove automake warnings
Diffstat (limited to 'strings/strxmov.c')
-rw-r--r--strings/strxmov.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/strings/strxmov.c b/strings/strxmov.c
index 9dd2c936620..d5d81fd9274 100644
--- a/strings/strxmov.c
+++ b/strings/strxmov.c
@@ -32,7 +32,6 @@
#include <my_global.h>
#include "m_string.h"
-#include <stdarg.h>
char *strxmov(char *dst,const char *src, ...)
{