From a17115daadb6b1bb099670b5a23ac47407bd0515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Thu, 10 Oct 2013 14:05:44 +0000
Subject: main/mysql: fix arm build (patch from upstream)

---
 main/mysql/APKBUILD            |  4 ++++
 main/mysql/mysql-va-list.patch | 51 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 main/mysql/mysql-va-list.patch

(limited to 'main/mysql')

diff --git a/main/mysql/APKBUILD b/main/mysql/APKBUILD
index 3422f70299..b68843ebe8 100644
--- a/main/mysql/APKBUILD
+++ b/main/mysql/APKBUILD
@@ -14,6 +14,7 @@ depends_dev="openssl-dev zlib-dev"
 makedepends="libtool readline-dev openssl-dev ncurses-dev zlib-dev cmake bison perl libaio-dev"
 source="ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.5/mysql-$pkgver.tar.gz
 	mysql-prefer-dynamic-library.patch
+	mysql-va-list.patch
 	$pkgname.initd
 	"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-test:mytest
@@ -189,10 +190,13 @@ bench() {
 
 md5sums="930970a42d51e48599deb7fe01778a4a  mysql-5.5.34.tar.gz
 b2b038b1905fa5b80f6723d0ee2f811f  mysql-prefer-dynamic-library.patch
+b08bf0844d4e52ab4a78a825511845fc  mysql-va-list.patch
 799b154c4ab8a1971d2753ab584a466a  mysql.initd"
 sha256sums="b0602b492d519602b7fa8e4cc87df998d9794fbc955819beec586a268fe06485  mysql-5.5.34.tar.gz
 83d685f6c03d0a1c4811b82ff973e617c3758a72e5d1659b409194221d0cc1c7  mysql-prefer-dynamic-library.patch
+9398daa424cf15518566dda6fbf6faed476da902e54e39b7acf222a3f5c7ab2e  mysql-va-list.patch
 6876f86d25bc8a276fd43c13e237feac4c2cef9f9cadb6edce1cee3d7b4b4b29  mysql.initd"
 sha512sums="dc2ea7e8a7fa0f2124f53d1c23d39a183b1b641069356baff6900fa7a03770c44bb924effd957f33f511fc28c4aa3913b8abc550d8104d54604bf1841b426144  mysql-5.5.34.tar.gz
 2b6dfe1262a68f08f6d9aa53d204b7fb7bb88af2c5d1e8f84bd83529ea0fb2521c2f10fdfb730ecc29c6d0acfca762badbd89a3679a05315572e679e4f3c12b0  mysql-prefer-dynamic-library.patch
+cd07298193db594f971adfe0f89939c38975b6aedd9480153920a9f65977f94daddc0bd35c287a81e76aaec52f311ce02517231ae44dea221d77a730749f45dc  mysql-va-list.patch
 6d5b144c17211b0ea0fa62e24543464bf65ba7abe6bf2284bbf81c8eda1430d304a40058f7ad8a4cb4070481ec5095348b0f3bf67ee719bc8ab20cff23cfd3a7  mysql.initd"
diff --git a/main/mysql/mysql-va-list.patch b/main/mysql/mysql-va-list.patch
new file mode 100644
index 0000000000..5b7c182120
--- /dev/null
+++ b/main/mysql/mysql-va-list.patch
@@ -0,0 +1,51 @@
+http://bugs.mysql.com/bug.php?id=62769
+
+diff -Naur mysql-5.5.16.orig/sql-common/client_plugin.c mysql-5.5.16/sql-common/client_plugin.c
+--- mysql-5.5.16.orig/sql-common/client_plugin.c	2011-09-09 11:56:39.000000000 -0400
++++ mysql-5.5.16/sql-common/client_plugin.c	2011-10-16 23:00:00.708799138 -0400
+@@ -228,11 +228,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);
+@@ -244,7 +246,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);
+ 
+@@ -288,9 +290,13 @@
+ 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 */
+@@ -302,7 +308,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;
-- 
cgit v1.2.3