diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-11-28 01:23:13 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-11-28 01:23:13 +0100 |
| commit | 835d8b62421fe1ea7710243dd3d4086a75728cf3 (patch) | |
| tree | 382283daec940ca72b296dc28e9dc3a2a841fe9d /client | |
| parent | 7e55deea9bdf59c165905f7e55c2bee8a2013515 (diff) | |
| parent | ac8dd6beb917f9b8d14409b565f259043d816e2b (diff) | |
| download | mariadb-git-835d8b62421fe1ea7710243dd3d4086a75728cf3.tar.gz | |
merge
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqldump.c | 2 | ||||
| -rw-r--r-- | client/mysqltest.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 0d209bd7034..bfdbf90d313 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -4427,7 +4427,7 @@ static int dump_selected_tables(char *db, char **table_names, int tables) static int do_show_master_status(MYSQL *mysql_con, int consistent_binlog_pos) { MYSQL_ROW row; - MYSQL_RES *master; + MYSQL_RES *UNINIT_VAR(master); char binlog_pos_file[FN_REFLEN]; char binlog_pos_offset[LONGLONG_LEN+1]; char *file, *offset; diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 29235dbd234..386577a4224 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -8137,8 +8137,8 @@ void run_query(struct st_connection *cn, struct st_command *command, int flags) char *re_eprint(int err) { static char epbuf[100]; - size_t len= my_regerror(REG_ITOA|err, (my_regex_t *)NULL, - epbuf, sizeof(epbuf)); + size_t len __attribute__((unused))= + my_regerror(REG_ITOA|err, (my_regex_t *)NULL, epbuf, sizeof(epbuf)); assert(len <= sizeof(epbuf)); return(epbuf); } |