Commit | Line | Data |
---|---|---|
e41262f8 VM |
1 | --- mysql-5.6.23/sql-common/client_plugin.c.orig 2015-04-02 13:08:28.255818357 +0200 |
2 | +++ mysql-5.6.23/sql-common/client_plugin.c 2015-04-02 13:11:57.325709613 +0200 | |
3 | @@ -259,6 +259,7 @@ | |
825e3023 VM |
4 | { |
5 | MYSQL mysql; | |
6 | struct st_mysql_client_plugin **builtin; | |
7 | + va_list dummy; | |
8 | ||
9 | if (initialized) | |
10 | return 0; | |
e41262f8 VM |
11 | @@ -275,7 +276,7 @@ |
12 | mysql_mutex_lock(&LOCK_load_client_plugin); | |
825e3023 VM |
13 | |
14 | for (builtin= mysql_client_builtins; *builtin; builtin++) | |
e41262f8 VM |
15 | - add_plugin_noargs(&mysql, *builtin, 0, 0); |
16 | + add_plugin_noargs(&mysql, *builtin, 0, 0, dummy); | |
825e3023 | 17 | |
e41262f8 | 18 | mysql_mutex_unlock(&LOCK_load_client_plugin); |
825e3023 | 19 | |
e41262f8 | 20 | @@ -319,6 +320,7 @@ |
825e3023 VM |
21 | mysql_client_register_plugin(MYSQL *mysql, |
22 | struct st_mysql_client_plugin *plugin) | |
23 | { | |
24 | + va_list dummy; | |
25 | if (is_not_initialized(mysql, plugin->name)) | |
26 | return NULL; | |
27 | ||
e41262f8 | 28 | @@ -333,7 +335,7 @@ |
825e3023 VM |
29 | plugin= NULL; |
30 | } | |
31 | else | |
e41262f8 VM |
32 | - plugin= add_plugin_noargs(mysql, plugin, 0, 0); |
33 | + plugin= add_plugin_noargs(mysql, plugin, 0, 0, dummy); | |
825e3023 | 34 | |
e41262f8 | 35 | mysql_mutex_unlock(&LOCK_load_client_plugin); |
825e3023 | 36 | return plugin; |