mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
Fix for compiler warnings:
Rename method as to not hide a base. Reorder attributes initialization. Remove unused variable. Rework code to silence a warning due to assignment used as truth value. sql/item_strfunc.cc: Rename method as to not hide a base. sql/item_strfunc.h: Rename method as to not hide a base. sql/log_event.cc: Reorder attributes initialization. sql/rpl_injector.cc: Rework code to silence a warning due to assignment used as truth value. sql/rpl_record.cc: Remove unused variable. sql/sql_db.cc: Rework code to silence a warning due to assignment used as truth value. sql/sql_parse.cc: Rework code to silence a warning due to assignment used as truth value. sql/sql_table.cc: Rework code to silence a warning due to assignment used as truth value.
This commit is contained in:
@@ -1765,19 +1765,19 @@ String *Item_func_encode::val_str(String *str)
|
||||
|
||||
null_value= 0;
|
||||
res= copy_if_not_alloced(str, res, res->length());
|
||||
transform(res);
|
||||
crypto_transform(res);
|
||||
sql_crypt.reinit();
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
void Item_func_encode::transform(String *res)
|
||||
void Item_func_encode::crypto_transform(String *res)
|
||||
{
|
||||
sql_crypt.encode((char*) res->ptr(),res->length());
|
||||
res->set_charset(&my_charset_bin);
|
||||
}
|
||||
|
||||
void Item_func_decode::transform(String *res)
|
||||
void Item_func_decode::crypto_transform(String *res)
|
||||
{
|
||||
sql_crypt.decode((char*) res->ptr(),res->length());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user