summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2017-07-12 22:54:49 +0400
committerAlexander Barkov <bar@mariadb.org>2017-07-12 22:54:49 +0400
commitdaec0004502a1f8c2ff7d46de92a61b5c4da1d6c (patch)
tree4b74130669a2558980be4ede5a2b3144c9f6fcd4 /libmysqld
parent0f348bcd965cd47784634508da2202aba2dc0547 (diff)
parent1d730ac42d58b5364690634260f915daea659259 (diff)
downloadmariadb-git-daec0004502a1f8c2ff7d46de92a61b5c4da1d6c.tar.gz
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/libmysql.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libmysqld/libmysql.c b/libmysqld/libmysql.c
index 09a477d04ee..d1176a4168c 100644
--- a/libmysqld/libmysql.c
+++ b/libmysqld/libmysql.c
@@ -122,7 +122,9 @@ typedef struct st_mysql_stmt_extension
1 could not initialize environment (out of memory or thread keys)
*/
-int STDCALL mysql_server_init(int argc, char **argv, char **groups)
+int STDCALL mysql_server_init(int argc __attribute__((unused)),
+ char **argv __attribute__((unused)),
+ char **groups __attribute__((unused)))
{
int result= 0;
if (!mysql_client_init)