cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 15:38:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

mariadb: Update to 10.4.17

Browse Source 
Update to the latest version from 10.4 series

Signed-off-by: Michal Hrusecky <michal.hrusecky@turris.com>
This commit is contained in:
Michal Hrusecky
2020-11-16 13:24:44 +01:00
parent f644dadfea
commit 33e4899870
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utils/mariadb/patches/170-ppc-remove-glibc-dep.patch
+12 -8
View File
@@ -1,5 +1,7 @@
--- a/include/my_cpu.h
+++ b/include/my_cpu.h
Index: mariadb-10.4.17/include/my_cpu.h
===================================================================
--- mariadb-10.4.17.orig/include/my_cpu.h
+++ mariadb-10.4.17/include/my_cpu.h
@@ -24,17 +24,16 @@
*/
@@ -23,17 +25,19 @@
/* High priority */
#define HMT_high() asm volatile("or 3,3,3")
#else
@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
@@ -80,7 +79,7 @@ static inline void MY_RELAX_CPU(void)
__asm__ __volatile__ ("pause");
#endif
#elif defined(_ARCH_PWR8)
- __ppc_get_timebase();
+ __builtin_ppc_get_timebase();
#else
int32 var, oldval = 0;
my_atomic_cas32_strong_explicit(&var, &oldval, 1, MY_MEMORY_ORDER_RELAXED,
--- a/storage/tokudb/PerconaFT/portability/toku_time.h
+++ b/storage/tokudb/PerconaFT/portability/toku_time.h
#elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
/* Mainly, prevent the compiler from optimizing away delay loops */
__asm__ __volatile__ ("":::"memory");
Index: mariadb-10.4.17/storage/tokudb/PerconaFT/portability/toku_time.h
===================================================================
--- mariadb-10.4.17.orig/storage/tokudb/PerconaFT/portability/toku_time.h
+++ mariadb-10.4.17/storage/tokudb/PerconaFT/portability/toku_time.h
@@ -124,7 +124,7 @@ static inline tokutime_t toku_time_now(v
__asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
return result;