rpms/mariadb
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Namespace sanity re-added for symbol default_charset_info

Browse Source
This commit is contained in:
Honza Horák 2013-01-30 17:04:04 +01:00
parent 5f858eef06
commit 5ebb875274
2 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
mariadb-dubious-exports.patch
View File

@ -9,9 +9,9 @@ It doesn't seem worth trying to get rid of all the internal symbols exposed
by mysql.h, but these two are relatively easy to get rid of. by mysql.h, but these two are relatively easy to get rid of.
diff -up mariadb-5.5.28a/client/mysqladmin.cc.p8 mariadb-5.5.28a/client/mysqladmin.cc diff -up mariadb-5.5.28a/client/mysqladmin.cc.p6 mariadb-5.5.28a/client/mysqladmin.cc
--- mariadb-5.5.28a/client/mysqladmin.cc.p8 2012-11-28 16:49:36.000000000 +0100 --- mariadb-5.5.28a/client/mysqladmin.cc.p6 2012-11-28 16:49:36.000000000 +0100
+++ mariadb-5.5.28a/client/mysqladmin.cc 2012-12-17 16:33:24.501007457 +0100 +++ mariadb-5.5.28a/client/mysqladmin.cc 2013-01-30 16:30:55.047537674 +0100
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
#include <my_pthread.h> /* because of signal() */ #include <my_pthread.h> /* because of signal() */
#include <sys/stat.h> #include <sys/stat.h>
@ -32,9 +32,9 @@ diff -up mariadb-5.5.28a/client/mysqladmin.cc.p8 mariadb-5.5.28a/client/mysqladm
} }
else else
crypted_pw[0]=0; /* No password */ crypted_pw[0]=0; /* No password */
diff -up mariadb-5.5.28a/include/errmsg.h.p8 mariadb-5.5.28a/include/errmsg.h diff -up mariadb-5.5.28a/include/errmsg.h.p6 mariadb-5.5.28a/include/errmsg.h
--- mariadb-5.5.28a/include/errmsg.h.p8 2012-11-28 16:49:43.000000000 +0100 --- mariadb-5.5.28a/include/errmsg.h.p6 2012-11-28 16:49:43.000000000 +0100
+++ mariadb-5.5.28a/include/errmsg.h 2012-12-17 16:33:24.501007457 +0100 +++ mariadb-5.5.28a/include/errmsg.h 2013-01-30 16:30:55.047537674 +0100
@@ -24,6 +24,7 @@ extern "C" { @@ -24,6 +24,7 @@ extern "C" {
#endif #endif
void init_client_errs(void); void init_client_errs(void);
@ -43,9 +43,9 @@ diff -up mariadb-5.5.28a/include/errmsg.h.p8 mariadb-5.5.28a/include/errmsg.h
extern const char *client_errors[]; /* Error messages */ extern const char *client_errors[]; /* Error messages */
#ifdef __cplusplus #ifdef __cplusplus
} }
diff -up mariadb-5.5.28a/include/mysql_com.h.p8 mariadb-5.5.28a/include/mysql_com.h diff -up mariadb-5.5.28a/include/mysql_com.h.p6 mariadb-5.5.28a/include/mysql_com.h
--- mariadb-5.5.28a/include/mysql_com.h.p8 2012-11-28 16:49:38.000000000 +0100 --- mariadb-5.5.28a/include/mysql_com.h.p6 2012-11-28 16:49:38.000000000 +0100
+++ mariadb-5.5.28a/include/mysql_com.h 2012-12-17 16:34:18.758025238 +0100 +++ mariadb-5.5.28a/include/mysql_com.h 2013-01-30 16:30:55.047537674 +0100
@@ -467,6 +467,7 @@ my_bool my_net_init(NET *net, Vio* vio); @@ -467,6 +467,7 @@ my_bool my_net_init(NET *net, Vio* vio);
void my_net_local_init(NET *net); void my_net_local_init(NET *net);
void net_end(NET *net); void net_end(NET *net);
@ -69,9 +69,9 @@ diff -up mariadb-5.5.28a/include/mysql_com.h.p8 mariadb-5.5.28a/include/mysql_co
void scramble(char *to, const char *message, const char *password); void scramble(char *to, const char *message, const char *password);
my_bool check_scramble(const unsigned char *reply, const char *message, my_bool check_scramble(const unsigned char *reply, const char *message,
const unsigned char *hash_stage2); const unsigned char *hash_stage2);
diff -up mariadb-5.5.28a/include/mysql.h.pp.p8 mariadb-5.5.28a/include/mysql.h.pp diff -up mariadb-5.5.28a/include/mysql.h.pp.p6 mariadb-5.5.28a/include/mysql.h.pp
--- mariadb-5.5.28a/include/mysql.h.pp.p8 2012-11-28 16:49:47.000000000 +0100 --- mariadb-5.5.28a/include/mysql.h.pp.p6 2012-11-28 16:49:47.000000000 +0100
+++ mariadb-5.5.28a/include/mysql.h.pp 2012-12-17 16:47:49.700371140 +0100 +++ mariadb-5.5.28a/include/mysql.h.pp 2013-01-30 16:30:55.048537674 +0100
@@ -84,7 +84,7 @@ my_bool my_net_init(NET *net, Vio* vio); @@ -84,7 +84,7 @@ my_bool my_net_init(NET *net, Vio* vio);
void my_net_local_init(NET *net); void my_net_local_init(NET *net);
void net_end(NET *net); void net_end(NET *net);
@ -95,10 +95,18 @@ diff -up mariadb-5.5.28a/include/mysql.h.pp.p8 mariadb-5.5.28a/include/mysql.h.p
void scramble(char *to, const char *message, const char *password); void scramble(char *to, const char *message, const char *password);
my_bool check_scramble(const unsigned char *reply, const char *message, my_bool check_scramble(const unsigned char *reply, const char *message,
const unsigned char *hash_stage2); const unsigned char *hash_stage2);
diff -up mariadb-5.5.28a/include/my_sys.h.p8 mariadb-5.5.28a/include/my_sys.h diff -up mariadb-5.5.28a/include/my_sys.h.p6 mariadb-5.5.28a/include/my_sys.h
--- mariadb-5.5.28a/include/my_sys.h.p8 2012-12-17 16:33:24.306007345 +0100 --- mariadb-5.5.28a/include/my_sys.h.p6 2013-01-30 16:30:54.980537678 +0100
+++ mariadb-5.5.28a/include/my_sys.h 2012-12-17 16:33:24.503007462 +0100 +++ mariadb-5.5.28a/include/my_sys.h 2013-01-30 16:31:38.510534702 +0100
@@ -943,6 +943,9 @@ extern uint get_charset_number(const cha @@ -211,6 +211,7 @@ extern uint my_large_page_size;
/* 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 struct charset_info_st compiled_charsets[];
@@ -943,6 +944,9 @@ extern uint get_charset_number(const cha
extern uint get_collation_number(const char *name); extern uint get_collation_number(const char *name);
extern const char *get_charset_name(uint cs_number); extern const char *get_charset_name(uint cs_number);
@ -108,9 +116,9 @@ diff -up mariadb-5.5.28a/include/my_sys.h.p8 mariadb-5.5.28a/include/my_sys.h
extern CHARSET_INFO *get_charset(uint cs_number, myf flags); 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 *get_charset_by_name(const char *cs_name, myf flags);
extern CHARSET_INFO *get_charset_by_csname(const char *cs_name, extern CHARSET_INFO *get_charset_by_csname(const char *cs_name,
diff -up mariadb-5.5.28a/sql/password.c.p8 mariadb-5.5.28a/sql/password.c diff -up mariadb-5.5.28a/sql/password.c.p6 mariadb-5.5.28a/sql/password.c
--- mariadb-5.5.28a/sql/password.c.p8 2012-11-28 16:49:48.000000000 +0100 --- mariadb-5.5.28a/sql/password.c.p6 2012-11-28 16:49:48.000000000 +0100
+++ mariadb-5.5.28a/sql/password.c 2012-12-17 16:33:24.503007462 +0100 +++ mariadb-5.5.28a/sql/password.c 2013-01-30 16:30:55.048537674 +0100
@@ -127,23 +127,6 @@ void my_make_scrambled_password_323(char @@ -127,23 +127,6 @@ void my_make_scrambled_password_323(char

1
mariadb.spec
View File

@ -754,6 +754,7 @@ fi
* Wed Jan 30 2013 Honza Horak <hhorak@redhat.com> 5.5.28a-7 * Wed Jan 30 2013 Honza Horak <hhorak@redhat.com> 5.5.28a-7
- Adding necessary hacks for perl dependency checking, rpm is still - Adding necessary hacks for perl dependency checking, rpm is still
not wise enough not wise enough
- Namespace sanity re-added for symbol default_charset_info
* Mon Jan 28 2013 Honza Horak <hhorak@redhat.com> 5.5.28a-6 * Mon Jan 28 2013 Honza Horak <hhorak@redhat.com> 5.5.28a-6
- Removed %%{_isa} from provides/obsoletes, which doesn't allow - Removed %%{_isa} from provides/obsoletes, which doesn't allow