diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-02-23 16:26:45 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-02-23 16:26:45 +0300 |
| commit | 92a5dd032365205beb5b14a347b3e681ce23da97 (patch) | |
| tree | 906d61216e1d999772c7a2a993909fc6915a9ab0 /cmd-line-utils | |
| parent | 8c31c4d16cfe9c3bbafcb30d0cd70210f6f230d3 (diff) | |
| parent | a341ec7400500e14f9d8aa8343698b6f70090172 (diff) | |
| download | mariadb-git-92a5dd032365205beb5b14a347b3e681ce23da97.tar.gz | |
Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:
Text conflict in client/mysqltest.cc
Text conflict in configure.in
Text conflict in mysql-test/include/mtr_warnings.sql
Diffstat (limited to 'cmd-line-utils')
| -rw-r--r-- | cmd-line-utils/readline/rlmbutil.h | 4 | ||||
| -rw-r--r-- | cmd-line-utils/readline/text.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmd-line-utils/readline/rlmbutil.h b/cmd-line-utils/readline/rlmbutil.h index dd317e2a090..6ca8fdde92b 100644 --- a/cmd-line-utils/readline/rlmbutil.h +++ b/cmd-line-utils/readline/rlmbutil.h @@ -109,8 +109,8 @@ extern int _rl_is_mbchar_matched PARAMS((char *, int, int, char *, int)); extern wchar_t _rl_char_value PARAMS((char *, int)); extern int _rl_walphabetic PARAMS((wchar_t)); -#define _rl_to_wupper(wc) (iswlower (wc) ? towupper (wc) : (wc)) -#define _rl_to_wlower(wc) (iswupper (wc) ? towlower (wc) : (wc)) +#define _rl_to_wupper(wc) (iswlower (wc) ? (wchar_t)towupper (wc) : (wc)) +#define _rl_to_wlower(wc) (iswupper (wc) ? (wchar_t)towlower (wc) : (wc)) #define MB_NEXTCHAR(b,s,c,f) \ ((MB_CUR_MAX > 1 && rl_byte_oriented == 0) \ diff --git a/cmd-line-utils/readline/text.c b/cmd-line-utils/readline/text.c index 272848c798c..bb0f5d97160 100644 --- a/cmd-line-utils/readline/text.c +++ b/cmd-line-utils/readline/text.c @@ -614,7 +614,7 @@ rl_arrow_keys (count, c) #ifdef HANDLE_MULTIBYTE static char pending_bytes[MB_LEN_MAX]; static int pending_bytes_length = 0; -static mbstate_t ps = {0}; +static mbstate_t ps; #endif /* Insert the character C at the current location, moving point forward. |