packages: mysql/libmysql.version, mysql/mysql-dubious-exports.patch, mysql/...

[glen]

Author: glen                         Date: Thu Mar 31 15:25:27 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rename is_prefix to mysql_is_prefix in exported syms

---- Files affected:
packages/mysql:
   libmysql.version (1.3 -> 1.4) , mysql-dubious-exports.patch (1.1 -> 1.2) , mysql.spec (1.541 -> 1.542) 

---- Diffs:

================================================================
Index: packages/mysql/libmysql.version
diff -u packages/mysql/libmysql.version:1.3 packages/mysql/libmysql.version:1.4
--- packages/mysql/libmysql.version:1.3	Thu Mar 31 15:15:45 2011
+++ packages/mysql/libmysql.version	Thu Mar 31 17:25:21 2011
@@ -140,6 +140,5 @@
 # PHP's mysqli.so requires this (via the ER() macro)
 	mysql_client_errors;
 # perl-DBD-mysql-4.018 for is_prefix
-# TODO: add it to mysql-dubious-exports.patch
-	is_prefix;
+	mysql_is_prefix;
 };

================================================================
Index: packages/mysql/mysql-dubious-exports.patch
diff -u packages/mysql/mysql-dubious-exports.patch:1.1 packages/mysql/mysql-dubious-exports.patch:1.2
--- packages/mysql/mysql-dubious-exports.patch:1.1	Thu Mar 31 14:01:47 2011
+++ packages/mysql/mysql-dubious-exports.patch	Thu Mar 31 17:25:21 2011
@@ -58,3 +58,46 @@
  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);
+--- mysql-5.5.9/include/m_string.h~	2011-01-20 00:37:08.000000000 +0200
++++ mysql-5.5.9/include/m_string.h	2011-03-31 16:36:35.184588054 +0300
+@@ -118,6 +118,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 */
+--- mysql-5.5.9/sql/ha_ndbcluster.h~	2011-01-20 00:37:09.000000000 +0200
++++ mysql-5.5.9/sql/ha_ndbcluster.h	2011-03-31 16:39:03.528050275 +0300
+@@ -28,7 +28,7 @@
+ #endif
+ 
+ /* Blob tables and events are internal to NDB and must never be accessed */
+-#define IS_NDB_BLOB_PREFIX(A) is_prefix(A, "NDB$BLOB")
++#define IS_NDB_BLOB_PREFIX(A) mysql_is_prefix(A, "NDB$BLOB")
+ 
+ #include <NdbApi.hpp>
+ #include <ndbapi_limits.h>
+--- mysql-5.5.9/sql/ha_ndbcluster_binlog.h~	2011-01-20 00:37:09.000000000 +0200
++++ mysql-5.5.9/sql/ha_ndbcluster_binlog.h	2011-03-31 16:39:17.212010376 +0300
+@@ -27,7 +27,7 @@
+ typedef NdbDictionary::Dictionary  NDBDICT;
+ typedef NdbDictionary::Event  NDBEVENT;
+ 
+-#define IS_TMP_PREFIX(A) (is_prefix(A, tmp_file_prefix))
++#define IS_TMP_PREFIX(A) (mysql_is_prefix(A, tmp_file_prefix))
+ 
+ #define INJECTOR_EVENT_LEN 200
+ 
+--- mysql-5.5.9/strings/is_prefix.c~	2011-01-20 00:37:10.000000000 +0200
++++ mysql-5.5.9/strings/is_prefix.c	2011-03-31 17:03:18.174663621 +0300
+@@ -24,7 +24,7 @@
+ #include <my_global.h>
+ #include "m_string.h"
+ 
+-int is_prefix(register const char *s, register const char *t)
++int mysql_is_prefix(register const char *s, register const char *t)
+ {
+   while (*t)
+     if (*s++ != *t++) return 0;

================================================================
Index: packages/mysql/mysql.spec
diff -u packages/mysql/mysql.spec:1.541 packages/mysql/mysql.spec:1.542
--- packages/mysql/mysql.spec:1.541	Thu Mar 31 15:15:45 2011
+++ packages/mysql/mysql.spec	Thu Mar 31 17:25:21 2011
@@ -38,7 +38,7 @@
 Summary(zh_CN.UTF-8):	MySQL数据库服务器
 Name:		mysql
 Version:	5.5.9
-Release:	6.2
+Release:	6.3
 License:	GPL + MySQL FLOSS Exception
 Group:		Applications/Databases
 # Source0Download: http://dev.mysql.com/downloads/mysql/5.5.html#downloads
@@ -1234,6 +1234,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.542  2011/03/31 15:25:21  glen
+- rename is_prefix to mysql_is_prefix in exported syms
+
 Revision 1.541  2011/03/31 13:15:45  glen
 - export is_prefix for perl-DBD-mysql (4.018)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/libmysql.version?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-dubious-exports.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.541&r2=1.542&f=u