diff options
| author | Galina Shalygina <galashalygina@gmail.com> | 2016-05-08 23:04:41 +0300 |
|---|---|---|
| committer | Galina Shalygina <galashalygina@gmail.com> | 2016-05-08 23:04:41 +0300 |
| commit | be1d06c8a5f843e775374e5ec148aaee56970bdc (patch) | |
| tree | bd7a95e771ca3b405583dccab8b468dd6fb4509f /libmysql | |
| parent | e09b1f2a226bf2763b211f74908a6486b83ebed1 (diff) | |
| download | mariadb-git-be1d06c8a5f843e775374e5ec148aaee56970bdc.tar.gz | |
Merge branch '10.2' into 10.2-mdev9864
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/errmsg.c | 2 | ||||
| -rw-r--r-- | libmysql/get_password.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libmysql/errmsg.c b/libmysql/errmsg.c index e30cdc9762b..fc5a6a07e11 100644 --- a/libmysql/errmsg.c +++ b/libmysql/errmsg.c @@ -90,7 +90,7 @@ const char *client_errors[]= "" }; -const char** get_client_errmsgs(void) +const char** get_client_errmsgs(int nr __attribute__((unused))) { return client_errors; } diff --git a/libmysql/get_password.c b/libmysql/get_password.c index e704aec8337..a113306ed57 100644 --- a/libmysql/get_password.c +++ b/libmysql/get_password.c @@ -46,7 +46,7 @@ #endif #endif #ifdef alpha_linux_port -#include <asm/ioctls.h> /* QQ; Fix this in configure */ +#include <asm/ioctls.h> #include <asm/termiobits.h> #endif #else |