1 files changed, 0 insertions, 41 deletions
diff --git a/mysql-s390-tsc.patch b/mysql-s390-tsc.patch
deleted file mode 100644
index 00811a4..0000000
--- a/mysql-s390-tsc.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Support s390/s390x in performance schema's cycle-counting functions.
-Filed upstream at http://bugs.mysql.com/bug.php?id=59953
-
-
-diff -Naur mysql-5.5.8.orig/include/my_rdtsc.h mysql-5.5.8/include/my_rdtsc.h
---- mysql-5.5.8.orig/include/my_rdtsc.h	2010-12-03 12:58:24.000000000 -0500
-+++ mysql-5.5.8/include/my_rdtsc.h	2011-02-04 11:16:45.431459913 -0500
-@@ -124,6 +124,7 @@
- #define MY_TIMER_ROUTINE_MACH_ABSOLUTE_TIME      25
- #define MY_TIMER_ROUTINE_GETSYSTEMTIMEASFILETIME 26
- #define MY_TIMER_ROUTINE_ASM_SUNPRO_X86_64       27
-+#define MY_TIMER_ROUTINE_ASM_S390                28
- 
- #endif
- 
-diff -Naur mysql-5.5.8.orig/mysys/my_rdtsc.c mysql-5.5.8/mysys/my_rdtsc.c
---- mysql-5.5.8.orig/mysys/my_rdtsc.c	2010-12-03 12:58:26.000000000 -0500
-+++ mysql-5.5.8/mysys/my_rdtsc.c	2011-02-04 11:16:45.432465577 -0500
-@@ -224,6 +224,13 @@
-     clock_gettime(CLOCK_SGI_CYCLE, &tp);
-     return (ulonglong) tp.tv_sec * 1000000000 + (ulonglong) tp.tv_nsec;
-   }
-+#elif defined(__GNUC__) && defined(__s390__)
-+  /* covers both s390 and s390x */
-+  {
-+    ulonglong result;
-+    __asm__ __volatile__ ("stck %0" : "=Q" (result) : : "cc");
-+    return result;
-+  }
- #elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME)
-   /* gethrtime may appear as either cycle or nanosecond counter */
-   return (ulonglong) gethrtime();
-@@ -533,6 +540,8 @@
-   mti->cycles.routine= MY_TIMER_ROUTINE_ASM_GCC_SPARC32;
- #elif defined(__sgi) && defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_SGI_CYCLE)
-   mti->cycles.routine= MY_TIMER_ROUTINE_SGI_CYCLE;
-+#elif defined(__GNUC__) && defined(__s390__)
-+  mti->cycles.routine= MY_TIMER_ROUTINE_ASM_S390;
- #elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME)
-   mti->cycles.routine= MY_TIMER_ROUTINE_GETHRTIME;
- #else