mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +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
@ -1056,7 +1056,7 @@ static uchar *get_hash_key(const uchar *buff, size_t *length,
|
||||
}
|
||||
|
||||
|
||||
static uchar *get_bookmark_hash_key(const uchar *buff, uint *length,
|
||||
static uchar *get_bookmark_hash_key(const uchar *buff, size_t *length,
|
||||
my_bool not_used __attribute__((unused)))
|
||||
{
|
||||
struct st_bookmark *var= (st_bookmark *)buff;
|
||||
@ -2879,9 +2879,9 @@ static int construct_options(MEM_ROOT *mem_root, struct st_plugin_int *tmp,
|
||||
if (!opt->update)
|
||||
{
|
||||
opt->update= update_func_str;
|
||||
if (!(opt->flags & PLUGIN_VAR_MEMALLOC))
|
||||
if (!(opt->flags & PLUGIN_VAR_MEMALLOC | PLUGIN_VAR_READONLY))
|
||||
{
|
||||
opt->flags |= PLUGIN_VAR_READONLY;
|
||||
opt->flags|= PLUGIN_VAR_READONLY;
|
||||
sql_print_warning("Server variable %s of plugin %s was forced "
|
||||
"to be read-only: string variable without "
|
||||
"update_func and PLUGIN_VAR_MEMALLOC flag",
|
||||
|
Reference in New Issue
Block a user