database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge with 5.1 + fixes for build failures in 5.2

Browse Source 
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
This commit is contained in:
Michael Widenius
2011-11-29 22:48:24 +02:00
parent 389acf0a30 a19f4e3a3a
commit a7f87effa5
11 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd-line-utils/libedit/map.c
View File

@ -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;

16
cmd-line-utils/libedit/terminal.c
View File

@ -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),

2
cmd-line-utils/libedit/tty.c
View File

@ -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;
}