Don't use 0 as va_list.

2 files changed, 43 insertions, 1 deletions

diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo
index f1668f09719..2d343d848cc 100644
--- a/databases/mysql55-client/distinfo
+++ b/databases/mysql55-client/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.37 2014/10/17 17:07:44 fhajny Exp $
+$NetBSD: distinfo,v 1.38 2014/11/25 14:54:22 joerg Exp $
 
 SHA1 (mysql-5.5.40.tar.gz) = b93a1b14ab2de390014e99b4293e7835da133196
 RMD160 (mysql-5.5.40.tar.gz) = a0b6b9a390ba8a3abc889155d756656b28b98f70
@@ -28,6 +28,7 @@ SHA1 (patch-mysys_my__getopt.c) = 6d03782c2ed50e9dc4cb57de9590d6734afa7d43
 SHA1 (patch-mysys_stacktrace.c) = 294b043984f740b99ba25abc8256ce8ad54d84c3
 SHA1 (patch-scripts_CMakeLists.txt) = 17ec1d8d5f0c9e453c64f2b59e757e645a3a1a59
 SHA1 (patch-scripts_mysqld_safe.sh) = cc34d8b4a8d4b34a6766a1123782ce3d0ad64478
+SHA1 (patch-sql-common_client__plugin.c) = d0e0b1c1aa7c3fcec28a9414f04e0c8601c4e4ff
 SHA1 (patch-sql_CMakeLists.txt) = c4e72a0a93eb94a94501c267e2a43aedf8de2c76
 SHA1 (patch-sql_log_event.h) = 43a52ea2f410aa51b99f2f7e1f293a579e13f9c8
 SHA1 (patch-sql_mysqld.cc) = 7e2cfb58f6af8531920dd9128f7b3a35735d7d2c
diff --git a/databases/mysql55-client/patches/patch-sql-common_client__plugin.c b/databases/mysql55-client/patches/patch-sql-common_client__plugin.c
new file mode 100644
index 00000000000..88593434763
--- /dev/null
+++ b/databases/mysql55-client/patches/patch-sql-common_client__plugin.c
@@ -0,0 +1,41 @@
+$NetBSD: patch-sql-common_client__plugin.c,v 1.1 2014/11/25 14:54:22 joerg Exp $
+
+--- sql-common/client_plugin.c.orig	2014-11-21 12:41:46.000000000 +0000
++++ sql-common/client_plugin.c
+@@ -179,6 +179,18 @@ err1:
+   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.
+@@ -249,7 +261,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, 0);
++    add_plugin_no_args(&mysql, *builtin, 0, 0);
+ 
+   pthread_mutex_unlock(&LOCK_load_client_plugin);
+ 
+@@ -307,7 +319,7 @@ mysql_client_register_plugin(MYSQL *mysq
+     plugin= NULL;
+   }
+   else
+-    plugin= add_plugin(mysql, plugin, 0, 0, 0);
++    plugin= add_plugin_no_args(mysql, plugin, 0, 0);
+ 
+   pthread_mutex_unlock(&LOCK_load_client_plugin);
+   return plugin;