[gentoo-commits] proj/mysql-extras:master commit in: /

[Robin H. Johnson]

commit:     d7795a46c2c51a9e95f90b1eafbdec25ef482d8f
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 28 17:27:42 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan 28 17:27:42 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=d7795a46

Port 20002_all_mysql-va-list.patch for 5.6.

---
 00000_index.txt                   |    7 ++++-
 20002_all_mysql-va-list-5.6.patch |   49 +++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletions(-)

diff --git a/00000_index.txt b/00000_index.txt
index ab3621f..5829392 100644
--- a/00000_index.txt
+++ b/00000_index.txt
@@ -1458,6 +1458,11 @@
 @@ Fix sql
 
 @patch 20002_all_mysql-va-list.patch
-@ver 5.05.00.00 to 5.99.99.99
+@ver 5.05.00.00 to 5.05.99.99
+@pn mysql
+@@ Bug 442000, upstream 62729 compilation failure on arm and possibly other arches where va_list is a struct or array.
+
+@patch 20002_all_mysql-va-list-5.6.patch
+@ver 5.06.00.00 to 5.99.99.99
 @pn mysql
 @@ Bug 442000, upstream 62729 compilation failure on arm and possibly other arches where va_list is a struct or array.

diff --git a/20002_all_mysql-va-list-5.6.patch b/20002_all_mysql-va-list-5.6.patch
new file mode 100644
index 0000000..1c06ed3
--- /dev/null
+++ b/20002_all_mysql-va-list-5.6.patch
@@ -0,0 +1,49 @@
+diff -Nuar --exclude '*.orig' --exclude '*.rej' mysql.orig/sql-common/client_plugin.c mysql/sql-common/client_plugin.c
+--- mysql.orig/sql-common/client_plugin.c	2012-11-22 14:39:01.000000000 +0000
++++ mysql/sql-common/client_plugin.c	2013-01-28 17:26:20.534550104 +0000
+@@ -233,11 +233,13 @@
+ {
+   MYSQL mysql;
+   struct st_mysql_client_plugin **builtin;
++  va_list unused;
+ 
+   if (initialized)
+     return 0;
+ 
+   memset(&mysql, 0, sizeof(mysql)); /* dummy mysql for set_mysql_extended_error */
++  memset(&unused, 0, sizeof(unused)); /* suppress uninitialized-value warnings */
+ 
+   mysql_mutex_init(0, &LOCK_load_client_plugin, MY_MUTEX_INIT_SLOW);
+   init_alloc_root(&mem_root, 128, 128);
+@@ -249,7 +251,7 @@
+   mysql_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);
+ 
+   mysql_mutex_unlock(&LOCK_load_client_plugin);
+ 
+@@ -293,9 +295,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;
+ 
++  memset(&unused, 0, sizeof(unused)); /* suppress uninitialized-value warnings */
++
+   mysql_mutex_lock(&LOCK_load_client_plugin);
+ 
+   /* make sure the plugin wasn't loaded meanwhile */
+@@ -307,7 +313,7 @@
+     plugin= NULL;
+   }
+   else
+-    plugin= add_plugin(mysql, plugin, 0, 0, 0);
++    plugin= add_plugin(mysql, plugin, 0, 0, unused);
+ 
+   mysql_mutex_unlock(&LOCK_load_client_plugin);
+   return plugin;