From d3d17c91ad0543690dc38d742d477a02fcfd72e2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 16 Dec 2010 20:13:41 +0100 Subject: MySQL 5.1.54 --- mysql-strmov.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'mysql-strmov.patch') diff --git a/mysql-strmov.patch b/mysql-strmov.patch index a144d09..07e5914 100644 --- a/mysql-strmov.patch +++ b/mysql-strmov.patch @@ -13,20 +13,20 @@ of any real performance gain from optimizing these calls. So I'm keeping this patch. -diff -Naur mysql-5.1.37.orig/include/m_string.h mysql-5.1.37/include/m_string.h ---- mysql-5.1.37.orig/include/m_string.h 2009-07-13 19:08:50.000000000 -0400 -+++ mysql-5.1.37/include/m_string.h 2009-08-31 21:49:49.000000000 -0400 -@@ -81,13 +81,6 @@ +--- mysql-5.1.54/include/m_string.h.orig 2010-11-29 11:38:01.000000000 +0100 ++++ mysql-5.1.54/include/m_string.h 2010-12-16 17:52:57.914976701 +0100 +@@ -73,14 +73,6 @@ extern void *(*my_str_malloc)(size_t); extern void (*my_str_free)(void *); --#if defined(HAVE_STPCPY) +-#if defined(HAVE_STPCPY) && MY_GNUC_PREREQ(3, 4) && !defined(__INTEL_COMPILER) +-#define strmov(A,B) __builtin_stpcpy((A),(B)) +-#elif defined(HAVE_STPCPY) -#define strmov(A,B) stpcpy((A),(B)) -#ifndef stpcpy -extern char *stpcpy(char *, const char *); /* For AIX with gcc 2.95.3 */ -#endif -#endif -- + /* Declared in int2str() */ extern char NEAR _dig_vec_upper[]; - extern char NEAR _dig_vec_lower[]; -- cgit