Commit | Line | Data |
---|---|---|
825e3023 VM |
1 | Based on Arnaud Patard patch for mysql 5.5.8 |
2 | =================================================================== | |
3 | --- mysql-5.5.16/sql-common/client_plugin.c 2011-09-30 13:09:10.709154000 +0200 | |
4 | +++ mysql-5.5.16/sql-common/client_plugin_new.c 2011-09-30 13:11:53.753154000 +0200 | |
5 | @@ -228,6 +228,7 @@ | |
6 | { | |
7 | MYSQL mysql; | |
8 | struct st_mysql_client_plugin **builtin; | |
9 | + va_list dummy; | |
10 | ||
11 | if (initialized) | |
12 | return 0; | |
13 | @@ -244,7 +245,7 @@ | |
14 | pthread_mutex_lock(&LOCK_load_client_plugin); | |
15 | ||
16 | for (builtin= mysql_client_builtins; *builtin; builtin++) | |
17 | - add_plugin(&mysql, *builtin, 0, 0, 0); | |
18 | + add_plugin(&mysql, *builtin, 0, 0, dummy); | |
19 | ||
20 | pthread_mutex_unlock(&LOCK_load_client_plugin); | |
21 | ||
22 | @@ -288,6 +289,7 @@ | |
23 | mysql_client_register_plugin(MYSQL *mysql, | |
24 | struct st_mysql_client_plugin *plugin) | |
25 | { | |
26 | + va_list dummy; | |
27 | if (is_not_initialized(mysql, plugin->name)) | |
28 | return NULL; | |
29 | ||
30 | @@ -302,7 +304,7 @@ | |
31 | plugin= NULL; | |
32 | } | |
33 | else | |
34 | - plugin= add_plugin(mysql, plugin, 0, 0, 0); | |
35 | + plugin= add_plugin(mysql, plugin, 0, 0, dummy); | |
36 | ||
37 | pthread_mutex_unlock(&LOCK_load_client_plugin); | |
38 | return plugin; |