-diff -Naur mysql-5.5.8.orig/include/my_sys.h mysql-5.5.8/include/my_sys.h
---- mysql-5.5.8.orig/include/my_sys.h 2010-12-03 12:58:24.000000000 -0500
-+++ mysql-5.5.8/include/my_sys.h 2010-12-27 14:27:23.956926896 -0500
-@@ -227,6 +227,7 @@
+diff -urNp -x '*.orig' percona-server-5.7.31-34.org/include/m_string.h percona-server-5.7.31-34/include/m_string.h
+--- percona-server-5.7.31-34.org/include/m_string.h 2020-08-15 11:23:18.000000000 +0200
++++ percona-server-5.7.31-34/include/m_string.h 2021-05-26 15:27:27.448089383 +0200
+@@ -193,6 +193,7 @@ static inline int native_strncasecmp(con
+ extern size_t strnlen(const char *s, size_t n);
+ #endif
+
++#define is_prefix mysql_is_prefix /* namespace sanity */
+ extern int is_prefix(const char *, const char *);
+
+ /* Conversion routines */
+diff -urNp -x '*.orig' percona-server-5.7.31-34.org/include/my_sys.h percona-server-5.7.31-34/include/my_sys.h
+--- percona-server-5.7.31-34.org/include/my_sys.h 2020-08-15 11:23:18.000000000 +0200
++++ percona-server-5.7.31-34/include/my_sys.h 2021-05-26 15:27:27.444755877 +0200
+@@ -261,6 +261,7 @@ extern int (*is_killed_hook)(const void