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;