1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed that --with-libedit --without-readline works

Browse Source 
Fixed buildbot failures (compiler warnings, failing tests)

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
configure.in:
  Fixed that --with-libedit --without-readline works
mysql-test/suite/innodb_plugin/t/innodb_misc1.test:
  Fixed test that failed when characterset was missing
This commit is contained in:
Michael Widenius 2011-12-01 20:11:41 +02:00
parent 6378bdbf47
commit dad1322940
5 changed files with 13 additions and 12 deletions
Show Stats 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;
}

2
configure.in
View File

@ -2702,7 +2702,7 @@ case $SYSTEM_TYPE in
echo "Skipping readline"
;;
*)
if [test "$with_libedit" = "yes"] || [test "$with_libedit" = "undefined"] && [test "$with_readline" = "undefined"]
if [test "$with_libedit" = "yes"] || ( [test "$with_libedit" = "undefined"] && [test "$with_readline" = "undefined"] )
then
readline_topdir="cmd-line-utils"
readline_basedir="libedit"

3
mysql-test/suite/innodb_plugin/t/innodb_misc1.test
View File

@ -1,5 +1,6 @@
-- source include/have_innodb_plugin.inc
-- source include/have_utf8.inc
let collation=utf8_unicode_ci;
--source include/have_collation.inc
let $MYSQLD_DATADIR= `select @@datadir`;