mirror of
https://github.com/MariaDB/server.git
synced 2025-08-31 22:22:30 +03:00
Added casts to avoid compiler warnings and fixed a wrong type.
--- Added casts and fixed wrong type. --- Added casts and fixed wrong type. --- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel --- Don't give warning that readonly variable is forced to be readonly mysql-test-run run now fails if we have [Warning] and [ERROR] as tags in .err file Fixed wrong reference to the mysql manual Fixed wrong prototype that caused some tests to fail on 64 bit platforms --- Disabled compiler warnings mainly for Win 64. --- Added casts to remove compiler warnings on windows Give warnings also for safe_mutex errors found by test system Added some warnings from different machines in pushbuild --- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel into mysql.com:/home/my/mysql-5.1 --- Added escapes for double quotes and parenthesis. --- Archive db fix plus added non-critical warnings in ignore list. --- Fixed previously added patch and added new ignored warning.
This commit is contained in:

parent
b035219762
commit
2c8f4f9791
@@ -1586,8 +1586,8 @@ my_bool my_like_range_ucs2(CHARSET_INFO *cs,
|
||||
|
||||
|
||||
|
||||
ulong my_scan_ucs2(CHARSET_INFO *cs __attribute__((unused)),
|
||||
const char *str, const char *end, int sequence_type)
|
||||
size_t my_scan_ucs2(CHARSET_INFO *cs __attribute__((unused)),
|
||||
const char *str, const char *end, int sequence_type)
|
||||
{
|
||||
const char *str0= str;
|
||||
end--; /* for easier loop condition, because of two bytes per character */
|
||||
@@ -1600,7 +1600,7 @@ ulong my_scan_ucs2(CHARSET_INFO *cs __attribute__((unused)),
|
||||
if (str[0] != '\0' || str[1] != ' ')
|
||||
break;
|
||||
}
|
||||
return (ulong) (str - str0);
|
||||
return (size_t) (str - str0);
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user