From 83af1bba93f0e7696bdba447c6ecf96cc679b789 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 18 Dec 2010 11:00:54 +0100 Subject: MySQL 5.5.8, first work on cmake, build ok, but not working for now --- mysql-5.5-strmov.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'mysql-5.5-strmov.patch') diff --git a/mysql-5.5-strmov.patch b/mysql-5.5-strmov.patch index 6d28154..faed43e 100644 --- a/mysql-5.5-strmov.patch +++ b/mysql-5.5-strmov.patch @@ -13,20 +13,20 @@ of any real performance gain from optimizing these calls. So I'm keeping this patch. -diff -up mysql-5.5.6-rc/include/m_string.h.orig mysql-5.5.6-rc/include/m_string.h ---- mysql-5.5.6-rc/include/m_string.h.orig 2010-09-17 22:48:10.000000000 +0200 -+++ mysql-5.5.6-rc/include/m_string.h 2010-09-24 19:22:01.948542880 +0200 -@@ -76,13 +76,6 @@ extern "C" { +--- mysql-5.5.8/include/m_string.h.orig 2010-12-03 18:58:24.000000000 +0100 ++++ mysql-5.5.8/include/m_string.h 2010-12-17 20:30:31.649497572 +0100 +@@ -74,14 +74,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 _dig_vec_upper[]; - extern char _dig_vec_lower[]; -- cgit