diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-04-09 17:03:48 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-04-09 17:03:48 +0200 |
| commit | cd776fedba3e2902bc25ee206d6e6266e7eb9411 (patch) | |
| tree | 95bf82d0e0522c6af708cd28639c82e004b5a264 /libmysql | |
| parent | f884d233e6a5f68bab846a7bdbd041fc4415ad77 (diff) | |
| parent | d516a2ae0cbd09d3b5b1667ec62b421330ab9902 (diff) | |
| download | mariadb-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 'libmysql')
| -rw-r--r-- | libmysql/errmsg.c | 2 | ||||
| -rw-r--r-- | libmysql/get_password.c | 2 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libmysql/errmsg.c b/libmysql/errmsg.c index e30cdc9762b..0930efe3655 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 diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 69ddb155f52..d5d673bb895 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -2233,7 +2233,7 @@ static int stmt_read_row_buffered(MYSQL_STMT *stmt, unsigned char **row) /* Read one row from network: unbuffered non-cursor fetch. - If last row was read, or error occured, erase this statement + If last row was read, or error occurred, erase this statement from record pointing to object unbuffered fetch is performed from. SYNOPSIS |