$NetBSD: patch-sql-common_client__plugin.c,v 1.1 2015/04/16 20:20:15 ryoon Exp $

--- sql-common/client_plugin.c.orig	2015-02-13 12:07:04.000000000 +0000
+++ sql-common/client_plugin.c
@@ -190,6 +190,18 @@ err1:
   DBUG_RETURN(NULL);
 }
 
+static struct st_mysql_client_plugin *
+add_plugin_no_args(MYSQL *mysql, struct st_mysql_client_plugin *plugin, void *dlhandle,
+           int argc, ...)
+{
+  va_list args;
+  struct st_mysql_client_plugin *rv;
+  va_start(args, argc);
+  rv = add_plugin(mysql, plugin, dlhandle, argc, args);
+  va_end(args);
+  return rv;
+}
+
 /**
   Loads plugins which are specified in the environment variable
   LIBMYSQL_PLUGINS.
@@ -260,7 +272,7 @@ int mysql_client_plugin_init()
   pthread_mutex_lock(&LOCK_load_client_plugin);
 
   for (builtin= mysql_client_builtins; *builtin; builtin++)
-    add_plugin(&mysql, *builtin, 0, 0, unused);
+    add_plugin_no_args(&mysql, *builtin, 0, 0, unused);
 
   pthread_mutex_unlock(&LOCK_load_client_plugin);
 
@@ -324,7 +336,7 @@ mysql_client_register_plugin(MYSQL *mysq
     plugin= NULL;
   }
   else
-    plugin= add_plugin(mysql, plugin, 0, 0, unused);
+    plugin= add_plugin_no_args(mysql, plugin, 0, 0, unused);
 
   pthread_mutex_unlock(&LOCK_load_client_plugin);
   DBUG_RETURN(plugin);