mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Bug #45286: compilation warnings on mysql-5.0-bugteam on MacOSX
Fixed the 5.0-bugteam MacOSX warnings.
This commit is contained in:
@ -3122,7 +3122,7 @@ static my_bool dump_all_views_in_db(char *database)
|
||||
for (numrows= 0 ; (table= getTableName(1)); )
|
||||
{
|
||||
char *end= strmov(afterdot, table);
|
||||
if (include_table((uchar*) hash_key,end - hash_key))
|
||||
if (include_table((byte*) hash_key,end - hash_key))
|
||||
{
|
||||
numrows++;
|
||||
dynstr_append_checked(&query, quote_name(table, table_buff, 1));
|
||||
@ -3143,7 +3143,7 @@ static my_bool dump_all_views_in_db(char *database)
|
||||
while ((table= getTableName(0)))
|
||||
{
|
||||
char *end= strmov(afterdot, table);
|
||||
if (include_table((uchar*) hash_key, end - hash_key))
|
||||
if (include_table((byte*) hash_key, end - hash_key))
|
||||
get_view_structure(table, database);
|
||||
}
|
||||
if (opt_xml)
|
||||
|
@ -699,8 +699,10 @@ rl_function_of_keyseq (keyseq, map, type)
|
||||
|
||||
for (i = 0; keyseq && keyseq[i]; i++)
|
||||
{
|
||||
unsigned char ic = keyseq[i];
|
||||
unsigned char uc = keyseq[i];
|
||||
int ic;
|
||||
|
||||
ic= uc;
|
||||
if (META_CHAR (ic) && _rl_convert_meta_chars_to_ascii)
|
||||
{
|
||||
if (map[ESC].type == ISKMAP)
|
||||
|
@ -1888,7 +1888,7 @@ rl_character_len (c, pos)
|
||||
|
||||
uc = (unsigned char)c;
|
||||
|
||||
if (META_CHAR (uc))
|
||||
if (META_CHAR (c))
|
||||
return ((_rl_output_meta_chars == 0) ? 4 : 1);
|
||||
|
||||
if (uc == '\t')
|
||||
|
@ -32,6 +32,7 @@
|
||||
.\" === Set line length
|
||||
.\".ll 6.5i
|
||||
.TL
|
||||
.warn 0
|
||||
D B U G
|
||||
.P 0
|
||||
C Program Debugging Package
|
||||
|
@ -327,7 +327,10 @@ my_string_repertoire(CHARSET_INFO *cs, const char *str, ulong length)
|
||||
{
|
||||
my_wc_t wc;
|
||||
int chlen;
|
||||
for (; (chlen= cs->cset->mb_wc(cs, &wc, str, strend)) > 0; str+= chlen)
|
||||
for (; (chlen= cs->cset->mb_wc(cs, &wc,
|
||||
(const unsigned char *) str,
|
||||
(const unsigned char *) strend)) > 0;
|
||||
str+= chlen)
|
||||
{
|
||||
if (wc > 0x7F)
|
||||
return MY_REPERTOIRE_UNICODE30;
|
||||
|
Reference in New Issue
Block a user