diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-11-29 22:48:24 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-11-29 22:48:24 +0200 |
| commit | a7f87effa57f6486c23bf5b340c8474a635dcf71 (patch) | |
| tree | 5f72d973eaaa8a62d871a25640a2618d7284537d /cmd-line-utils | |
| parent | 389acf0a30415c745d2c241e1584b0b637ab95ed (diff) | |
| parent | a19f4e3a3af4c18ec89f8f8a4ae32e3c7d7fec70 (diff) | |
| download | mariadb-git-a7f87effa57f6486c23bf5b340c8474a635dcf71.tar.gz | |
Merge with 5.1 + fixes for build failures in 5.2
cmd-line-utils/libedit/map.c:
Fixed compiler warning
cmd-line-utils/libedit/terminal.c:
Fixed compiler warning
cmd-line-utils/libedit/tty.c:
Fixed compiler warning
sql/sql_base.cc:
Fixed memory leak found by valgrind
storage/maria/compat_aliases.cc:
Ensure that recover_alias is also a set
storage/maria/ma_bitmap.c:
Proper fix for compiler warning
support-files/compiler_warnings.supp:
Fixed compiler warning
Diffstat (limited to 'cmd-line-utils')
| -rw-r--r-- | cmd-line-utils/libedit/map.c | 2 | ||||
| -rw-r--r-- | cmd-line-utils/libedit/terminal.c | 16 | ||||
| -rw-r--r-- | cmd-line-utils/libedit/tty.c | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/cmd-line-utils/libedit/map.c b/cmd-line-utils/libedit/map.c index 946bc185437..17b07391b69 100644 --- a/cmd-line-utils/libedit/map.c +++ b/cmd-line-utils/libedit/map.c @@ -1300,7 +1300,7 @@ map_bind(EditLine *el, int argc, const Char **argv) default: (void) fprintf(el->el_errfile, "" FSTR ": Invalid switch `%c'.\n", - argv[0], p[1]); + argv[0], (int) p[1]); } else break; diff --git a/cmd-line-utils/libedit/terminal.c b/cmd-line-utils/libedit/terminal.c index 8cfbeac7c52..fb5600a4140 100644 --- a/cmd-line-utils/libedit/terminal.c +++ b/cmd-line-utils/libedit/terminal.c @@ -908,17 +908,17 @@ terminal_set(EditLine *el, const char *term) terminal_alloc(el, t, NULL); } else { /* auto/magic margins */ - Val(T_am) = tgetflag("am"); - Val(T_xn) = tgetflag("xn"); + Val(T_am) = tgetflag((char*) "am"); + Val(T_xn) = tgetflag((char*) "xn"); /* Can we tab */ - Val(T_pt) = tgetflag("pt"); - Val(T_xt) = tgetflag("xt"); + Val(T_pt) = tgetflag((char*) "pt"); + Val(T_xt) = tgetflag((char*) "xt"); /* do we have a meta? */ - Val(T_km) = tgetflag("km"); - Val(T_MT) = tgetflag("MT"); + Val(T_km) = tgetflag((char*) "km"); + Val(T_MT) = tgetflag((char*) "MT"); /* Get the size */ - Val(T_co) = tgetnum("co"); - Val(T_li) = tgetnum("li"); + Val(T_co) = tgetnum((char*) "co"); + Val(T_li) = tgetnum((char*) "li"); for (t = tstr; t->name != NULL; t++) { /* XXX: some systems' tgetstr needs non const */ terminal_alloc(el, t, tgetstr(strchr(t->name, *t->name), diff --git a/cmd-line-utils/libedit/tty.c b/cmd-line-utils/libedit/tty.c index 46624a87077..eea00bfc245 100644 --- a/cmd-line-utils/libedit/tty.c +++ b/cmd-line-utils/libedit/tty.c @@ -1215,7 +1215,7 @@ tty_stty(EditLine *el, int argc __attribute__((__unused__)), const Char **argv) default: (void) fprintf(el->el_errfile, "%s: Unknown switch `%c'.\n", - name, argv[0][1]); + name, (int) argv[0][1]); return -1; } |