- keep common dirs for mysqlrouter in mysql-common, fix /var/{lib,log} dirs

[packages/mysql.git] / mysql-dubious-exports.patch

diff --git a/mysql-dubious-exports.patch b/mysql-dubious-exports.patch
deleted file mode 100644 (file)
index a928927..0000000
--- a/mysql-dubious-exports.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -ur percona-server-5.7.35-38.orig/include/m_string.h percona-server-5.7.35-38/include/m_string.h
---- percona-server-5.7.35-38.orig/include/m_string.h   2021-11-24 19:49:05.797848959 +0100
-+++ percona-server-5.7.35-38/include/m_string.h        2021-11-24 19:49:38.519926500 +0100
-@@ -193,6 +193,7 @@
- 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 -ur percona-server-5.7.35-38.orig/include/mysql_com.h percona-server-5.7.35-38/include/mysql_com.h
---- percona-server-5.7.35-38.orig/include/mysql_com.h  2021-11-24 19:49:05.801848968 +0100
-+++ percona-server-5.7.35-38/include/mysql_com.h       2021-11-24 19:49:38.553926581 +0100
-@@ -522,6 +522,7 @@
- void net_end(NET *net);
- void net_clear(NET *net, my_bool check_buffer);
- void net_claim_memory_ownership(NET *net);
-+#define net_realloc mysql_net_realloc          /* namespace sanity */
- my_bool net_realloc(NET *net, size_t length);
- my_bool       net_flush(NET *net);
- my_bool       my_net_write(NET *net,const unsigned char *packet, size_t len);
-diff -ur percona-server-5.7.35-38.orig/include/mysql.h.pp percona-server-5.7.35-38/include/mysql.h.pp
---- percona-server-5.7.35-38.orig/include/mysql.h.pp   2021-11-24 19:49:05.799848964 +0100
-+++ percona-server-5.7.35-38/include/mysql.h.pp        2021-11-24 19:49:38.552926579 +0100
-@@ -128,7 +128,7 @@
- void net_end(NET *net);
- void net_clear(NET *net, my_bool check_buffer);
- void net_claim_memory_ownership(NET *net);
--my_bool net_realloc(NET *net, size_t length);
-+my_bool mysql_net_realloc(NET *net, size_t length);
- my_bool net_flush(NET *net);
- my_bool my_net_write(NET *net,const unsigned char *packet, size_t len);
- my_bool net_write_command(NET *net,unsigned char command,
-diff -ur percona-server-5.7.35-38.orig/include/my_sys.h percona-server-5.7.35-38/include/my_sys.h
---- percona-server-5.7.35-38.orig/include/my_sys.h     2021-11-24 19:49:05.798848961 +0100
-+++ percona-server-5.7.35-38/include/my_sys.h  2021-11-24 19:49:38.552926579 +0100
-@@ -261,6 +261,7 @@
- 
- /* charsets */
- #define MY_ALL_CHARSETS_SIZE 2048
-+#define default_charset_info mysql_default_charset_info       /* namespace sanity */
- extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *default_charset_info;
- extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *all_charsets[MY_ALL_CHARSETS_SIZE];
- extern CHARSET_INFO compiled_charsets[];
-@@ -999,6 +1000,9 @@
- extern uint get_collation_number(const char *name);
- extern const char *get_charset_name(uint cs_number);
- 
-+#define get_charset mysql_get_charset         /* namespace sanity */
-+#define get_charset_by_csname mysql_get_charset_by_csname
-+
- extern CHARSET_INFO *get_charset(uint cs_number, myf flags);
- extern CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags);
- extern CHARSET_INFO *my_collation_get_by_name(MY_CHARSET_LOADER *loader,