sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 01:09:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to 5.5.40 release and unbreak on armv6 [1].

Browse source 
PR:		193841 [1]
Submitted by:	mikael.urankar@gmail.com
This commit is contained in:
Alex Dupre 2014-09-23 15:03:22 +00:00
parent 2292c9b5f4
commit fa1c1bc803
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=369067
6 changed files with 98 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
databases/mysql55-client/files/patch-sql_common_client_plugin.c Normal file
View file

@ -0,0 +1,47 @@
--- sql-common/client_plugin.c.orig 2014-09-22 09:23:23 UTC
+++ sql-common/client_plugin.c
@@ -233,11 +233,13 @@
{
MYSQL mysql;
struct st_mysql_client_plugin **builtin;
+ va_list unused;
if (initialized)
return 0;
bzero(&mysql, sizeof(mysql)); /* dummy mysql for set_mysql_extended_error */
+ bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */
pthread_mutex_init(&LOCK_load_client_plugin, MY_MUTEX_INIT_SLOW);
init_alloc_root(&mem_root, 128, 128);
@@ -249,7 +251,7 @@
pthread_mutex_lock(&LOCK_load_client_plugin);
for (builtin= mysql_client_builtins; *builtin; builtin++)
- add_plugin(&mysql, *builtin, 0, 0, 0);
+ add_plugin(&mysql, *builtin, 0, 0, unused);
pthread_mutex_unlock(&LOCK_load_client_plugin);
@@ -293,9 +295,12 @@
mysql_client_register_plugin(MYSQL *mysql,
struct st_mysql_client_plugin *plugin)
{
+ va_list unused;
if (is_not_initialized(mysql, plugin->name))
return NULL;
+ bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */
+
pthread_mutex_lock(&LOCK_load_client_plugin);
/* make sure the plugin wasn't loaded meanwhile */
@@ -307,7 +312,7 @@
plugin= NULL;
}
else
- plugin= add_plugin(mysql, plugin, 0, 0, 0);
+ plugin= add_plugin(mysql, plugin, 0, 0, unused);
pthread_mutex_unlock(&LOCK_load_client_plugin);
return plugin;

4
databases/mysql55-client/pkg-plist
View file

@ -83,7 +83,3 @@ man/man1/mysqlimport.1.gz
man/man1/mysqlshow.1.gz
man/man1/mysqlslap.1.gz
share/aclocal/mysql.m4
@dirrm include/mysql/mysql/psi
@dirrm include/mysql/mysql
@dirrm include/mysql
@dirrmtry lib/mysql

10
databases/mysql55-server/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME?= mysql
PORTVERSION= 5.5.39
PORTVERSION= 5.5.40
PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= ${MASTER_SITE_MYSQL}
@ -83,10 +83,4 @@ CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON"
post-patch:
@${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt
.include <bsd.port.pre.mk>
.if ${ARCH} == "arm"
BROKEN= Does not compile on arm
.endif
.include <bsd.port.post.mk>
.include <bsd.port.mk>

4
databases/mysql55-server/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (mysql-5.5.39.tar.gz) = 1893a00b034da6ff4159b81348388dc65eca6c3ae12962bd446e9b3d105b4862
SIZE (mysql-5.5.39.tar.gz) = 21713567
SHA256 (mysql-5.5.40.tar.gz) = 4d3721761a31c28866e8ee0fde47558a3e9047aaef3b89135ae8d45eebb74960
SIZE (mysql-5.5.40.tar.gz) = 21727672

47
databases/mysql55-server/files/patch-sql_common_client_plugin.c Normal file
View file

@ -0,0 +1,47 @@
--- sql-common/client_plugin.c.orig 2014-09-22 09:23:23 UTC
+++ sql-common/client_plugin.c
@@ -233,11 +233,13 @@
{
MYSQL mysql;
struct st_mysql_client_plugin **builtin;
+ va_list unused;
if (initialized)
return 0;
bzero(&mysql, sizeof(mysql)); /* dummy mysql for set_mysql_extended_error */
+ bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */
pthread_mutex_init(&LOCK_load_client_plugin, MY_MUTEX_INIT_SLOW);
init_alloc_root(&mem_root, 128, 128);
@@ -249,7 +251,7 @@
pthread_mutex_lock(&LOCK_load_client_plugin);
for (builtin= mysql_client_builtins; *builtin; builtin++)
- add_plugin(&mysql, *builtin, 0, 0, 0);
+ add_plugin(&mysql, *builtin, 0, 0, unused);
pthread_mutex_unlock(&LOCK_load_client_plugin);
@@ -293,9 +295,12 @@
mysql_client_register_plugin(MYSQL *mysql,
struct st_mysql_client_plugin *plugin)
{
+ va_list unused;
if (is_not_initialized(mysql, plugin->name))
return NULL;
+ bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */
+
pthread_mutex_lock(&LOCK_load_client_plugin);
/* make sure the plugin wasn't loaded meanwhile */
@@ -307,7 +312,7 @@
plugin= NULL;
}
else
- plugin= add_plugin(mysql, plugin, 0, 0, 0);
+ plugin= add_plugin(mysql, plugin, 0, 0, unused);
pthread_mutex_unlock(&LOCK_load_client_plugin);
return plugin;

28
databases/mysql55-server/pkg-plist
View file

@ -1,4 +1,3 @@
@stopdaemon mysql-server
bin/innochecksum
bin/my_print_defaults
bin/myisam_ftdump
@ -136,30 +135,3 @@ man/man8/mysqld.8.gz
%%DATADIR%%/spanish/errmsg.sys
%%DATADIR%%/swedish/errmsg.sys
%%DATADIR%%/ukrainian/errmsg.sys
@dirrm lib/mysql/plugin
@dirrmtry lib/mysql
@dirrm %%DATADIR%%/charsets
@dirrm %%DATADIR%%/czech
@dirrm %%DATADIR%%/danish
@dirrm %%DATADIR%%/dutch
@dirrm %%DATADIR%%/english
@dirrm %%DATADIR%%/estonian
@dirrm %%DATADIR%%/french
@dirrm %%DATADIR%%/german
@dirrm %%DATADIR%%/greek
@dirrm %%DATADIR%%/hungarian
@dirrm %%DATADIR%%/italian
@dirrm %%DATADIR%%/japanese
@dirrm %%DATADIR%%/korean
@dirrm %%DATADIR%%/norwegian
@dirrm %%DATADIR%%/norwegian-ny
@dirrm %%DATADIR%%/polish
@dirrm %%DATADIR%%/portuguese
@dirrm %%DATADIR%%/romanian
@dirrm %%DATADIR%%/russian
@dirrm %%DATADIR%%/serbian
@dirrm %%DATADIR%%/slovak
@dirrm %%DATADIR%%/spanish
@dirrm %%DATADIR%%/swedish
@dirrm %%DATADIR%%/ukrainian
@dirrm %%DATADIR%%