packages: mysql/mysql.spec, mysql/mysql-dubious-exports.patch (NEW) - add m...

glen glen at pld-linux.org
Thu Mar 31 14:01:53 CEST 2011 

Author: glen                         Date: Thu Mar 31 12:01:53 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add mysql-dubious-exports.patch from fedora, used by libmysql.version

---- Files affected:
packages/mysql:
   mysql.spec (1.539 -> 1.540) , mysql-dubious-exports.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mysql/mysql.spec
diff -u packages/mysql/mysql.spec:1.539 packages/mysql/mysql.spec:1.540
--- packages/mysql/mysql.spec:1.539	Thu Mar 31 13:46:14 2011
+++ packages/mysql/mysql.spec	Thu Mar 31 14:01:47 2011
@@ -38,7 +38,7 @@
 Summary(zh_CN.UTF-8):	MySQL数据库服务器
 Name:		mysql
 Version:	5.5.9
-Release:	6
+Release:	6.1
 License:	GPL + MySQL FLOSS Exception
 Group:		Applications/Databases
 # Source0Download: http://dev.mysql.com/downloads/mysql/5.5.html#downloads
@@ -76,10 +76,12 @@
 Patch14:	%{name}-bug-43594.patch
 Patch18:	%{name}-sphinx.patch
 Patch19:	%{name}-chain-certs.patch
+# from fedora
+Patch20:	%{name}-dubious-exports.patch
 # <percona patches, updated with percona.sh>
 Patch100:	microsec_process.patch
 Patch101:	optimizer_fix.patch
-Patch102:	mysql_dump_ignore_ct.patch
+Patch102:	%{name}_dump_ignore_ct.patch
 Patch103:	control_online_alter_index.patch
 Patch104:	show_temp.patch
 Patch105:	innodb_show_status.patch
@@ -112,7 +114,7 @@
 Patch132:	percona_support.patch
 Patch133:	query_cache_enhance.patch
 Patch134:	log_connection_error.patch
-Patch135:	mysql_syslog.patch
+Patch135:	%{name}_syslog.patch
 Patch136:	response_time_distribution.patch
 Patch137:	error_pad.patch
 Patch138:	remove_fcntl_excessive_calls.patch
@@ -121,7 +123,7 @@
 Patch141:	log_warnings_suppress.patch
 Patch142:	userstat.patch
 Patch143:	bug580324.patch
-Patch144:	mysql_remove_eol_carret.patch
+Patch144:	%{name}_remove_eol_carret.patch
 # </percona>
 URL:		http://www.mysql.com/products/community/
 BuildRequires:	bison
@@ -560,6 +562,7 @@
 %patch12 -p1
 %patch14 -p0
 %patch19 -p1
+%patch20 -p1
 # <percona %patches>
 %patch100 -p1
 %patch101 -p1
@@ -1231,6 +1234,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.540  2011/03/31 12:01:47  glen
+- add mysql-dubious-exports.patch from fedora, used by libmysql.version
+
 Revision 1.539  2011/03/31 11:46:14  glen
 - todo
 

================================================================
Index: packages/mysql/mysql-dubious-exports.patch
diff -u /dev/null packages/mysql/mysql-dubious-exports.patch:1.1
--- /dev/null	Thu Mar 31 14:01:53 2011
+++ packages/mysql/mysql-dubious-exports.patch	Thu Mar 31 14:01:47 2011
@@ -0,0 +1,60 @@
+Prefix mysql_ to the real names of several symbols that have to be exported
+from libmysqlclient because mysql-connector-odbc and/or PHP depend on them.
+This limits the intrusion on application namespace.
+
+
+diff -Naur mysql-5.5.8.orig/include/errmsg.h mysql-5.5.8/include/errmsg.h
+--- mysql-5.5.8.orig/include/errmsg.h	2010-12-03 12:58:24.000000000 -0500
++++ mysql-5.5.8/include/errmsg.h	2010-12-27 14:29:59.184552374 -0500
+@@ -24,6 +24,7 @@
+ #endif
+ void	init_client_errs(void);
+ void	finish_client_errs(void);
++#define client_errors mysql_client_errors		/* namespace sanity */
+ extern const char *client_errors[];	/* Error messages */
+ #ifdef	__cplusplus
+ }
+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 @@
+ 
+ /* 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[];
+@@ -914,6 +915,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 *get_charset_by_csname(const char *cs_name,
+diff -Naur mysql-5.5.8.orig/include/mysql.h.pp mysql-5.5.8/include/mysql.h.pp
+--- mysql-5.5.8.orig/include/mysql.h.pp	2010-12-03 12:58:24.000000000 -0500
++++ mysql-5.5.8/include/mysql.h.pp	2010-12-27 14:27:23.956926896 -0500
+@@ -86,7 +86,7 @@
+ void my_net_local_init(NET *net);
+ void net_end(NET *net);
+   void net_clear(NET *net, my_bool clear_buffer);
+-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 -Naur mysql-5.5.8.orig/include/mysql_com.h mysql-5.5.8/include/mysql_com.h
+--- mysql-5.5.8.orig/include/mysql_com.h	2010-12-03 12:58:24.000000000 -0500
++++ mysql-5.5.8/include/mysql_com.h	2010-12-27 14:27:23.957927198 -0500
+@@ -448,6 +448,7 @@
+ void	my_net_local_init(NET *net);
+ void	net_end(NET *net);
+   void	net_clear(NET *net, my_bool clear_buffer);
++#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);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.539&r2=1.540&f=u

More information about the pld-cvs-commit mailing list