diff options
| -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 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | mysql-test/suite/innodb_plugin/t/innodb_misc1.test | 3 |
5 files changed, 13 insertions, 12 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; } diff --git a/configure.in b/configure.in index e8a2979de68..34ca4e171b2 100644 --- a/configure.in +++ b/configure.in @@ -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" diff --git a/mysql-test/suite/innodb_plugin/t/innodb_misc1.test b/mysql-test/suite/innodb_plugin/t/innodb_misc1.test index 31f9988d1ac..4d66701c927 100644 --- a/mysql-test/suite/innodb_plugin/t/innodb_misc1.test +++ b/mysql-test/suite/innodb_plugin/t/innodb_misc1.test @@ -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`; |