summaryrefslogtreecommitdiff
path: root/mysys/errors.c
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2016-04-09 17:03:48 +0200
committerVladislav Vaintroub <wlad@mariadb.com>2016-04-09 17:03:48 +0200
commitcd776fedba3e2902bc25ee206d6e6266e7eb9411 (patch)
tree95bf82d0e0522c6af708cd28639c82e004b5a264 /mysys/errors.c
parentf884d233e6a5f68bab846a7bdbd041fc4415ad77 (diff)
parentd516a2ae0cbd09d3b5b1667ec62b421330ab9902 (diff)
downloadmariadb-git-10.2-connector-c-integ.tar.gz
Merge branch '10.2' into 10.2-connector-c-integ10.2-connector-c-integ
Diffstat (limited to 'mysys/errors.c')
-rw-r--r--mysys/errors.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/errors.c b/mysys/errors.c
index 11e7d04e79e..e3fbfd4d8e6 100644
--- a/mysys/errors.c
+++ b/mysys/errors.c
@@ -119,7 +119,7 @@ void wait_for_free_space(const char *filename, int errors)
(void) sleep(MY_WAIT_FOR_USER_TO_FIX_PANIC);
}
-const char **get_global_errmsgs()
+const char **get_global_errmsgs(int nr __attribute__((unused)))
{
return globerrs;
}