From 0585e168b60a114632b69d993f856b353f888e0d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 24 Sep 2010 22:06:47 +0200 Subject: mysql 5.5.6 first work --- mysql-5.5-strmov.patch | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 mysql-5.5-strmov.patch (limited to 'mysql-5.5-strmov.patch') diff --git a/mysql-5.5-strmov.patch b/mysql-5.5-strmov.patch new file mode 100644 index 0000000..6d28154 --- /dev/null +++ b/mysql-5.5-strmov.patch @@ -0,0 +1,32 @@ +Remove overly optimistic definition of strmov() as stpcpy(). + +mysql uses this macro with overlapping source and destination strings, +which is verboten per spec, and fails on some Red Hat platforms. +Deleting the definition is sufficient to make it fall back to a +byte-at-a-time copy loop, which should consistently give the +expected behavior. + +Note: the particular case that prompted this patch is reported and fixed +at http://bugs.mysql.com/bug.php?id=48864. However, my faith in upstream's +ability to detect this type of error is low, and I also see little evidence +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" { + extern void *(*my_str_malloc)(size_t); + extern void (*my_str_free)(void *); + +-#if 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