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

PR:		193841 [1]
Submitted by:	mikael.urankar@gmail.com

1 files changed, 47 insertions, 0 deletions

diff --git a/databases/mysql55-server/files/patch-sql_common_client_plugin.c b/databases/mysql55-server/files/patch-sql_common_client_plugin.c
new file mode 100644
index 000000000000..069eaef76e11
--- /dev/null
+++ b/databases/mysql55-server/files/patch-sql_common_client_plugin.c
@@ -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;