summaryrefslogtreecommitdiff
path: root/sql-common/client_plugin.c
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-05-10 17:20:26 +0300
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-05-10 17:20:26 +0300
commit712f2d3833a9f5aa35b8171350a4414e709d509c (patch)
treededfe71cc0ebd78c6ac5ec49fb9a366ff76a4bf1 /sql-common/client_plugin.c
parent6ed5d97801c983fea358c8ad95ef2a23d047efc7 (diff)
parent2b9c0451f796e3c6a1da78c6d385fe3ddf27e9b9 (diff)
downloadmariadb-git-712f2d3833a9f5aa35b8171350a4414e709d509c.tar.gz
weave merge of mysql-5.5->mysql-5.5-security
Diffstat (limited to 'sql-common/client_plugin.c')
-rw-r--r--sql-common/client_plugin.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql-common/client_plugin.c b/sql-common/client_plugin.c
index 47409e34d9a..382f14c6b3d 100644
--- a/sql-common/client_plugin.c
+++ b/sql-common/client_plugin.c
@@ -460,7 +460,7 @@ mysql_client_find_plugin(MYSQL *mysql, const char *name, int type)
/* see <mysql/client_plugin.h> for a full description */
-int STDCALL mysql_plugin_options(struct st_mysql_client_plugin *plugin,
+int mysql_plugin_options(struct st_mysql_client_plugin *plugin,
const char *option,
const void *value)
{