mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +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:
@ -114,8 +114,8 @@ int injector::transaction::write_row (server_id_type sid, table tbl,
|
||||
{
|
||||
DBUG_ENTER("injector::transaction::write_row(...)");
|
||||
|
||||
int error= 0;
|
||||
if (error= check_state(ROW_STATE))
|
||||
int error= check_state(ROW_STATE);
|
||||
if (error)
|
||||
DBUG_RETURN(error);
|
||||
|
||||
server_id_type save_id= m_thd->server_id;
|
||||
@ -133,8 +133,8 @@ int injector::transaction::delete_row(server_id_type sid, table tbl,
|
||||
{
|
||||
DBUG_ENTER("injector::transaction::delete_row(...)");
|
||||
|
||||
int error= 0;
|
||||
if (error= check_state(ROW_STATE))
|
||||
int error= check_state(ROW_STATE);
|
||||
if (error)
|
||||
DBUG_RETURN(error);
|
||||
|
||||
server_id_type save_id= m_thd->server_id;
|
||||
@ -152,8 +152,8 @@ int injector::transaction::update_row(server_id_type sid, table tbl,
|
||||
{
|
||||
DBUG_ENTER("injector::transaction::update_row(...)");
|
||||
|
||||
int error= 0;
|
||||
if (error= check_state(ROW_STATE))
|
||||
int error= check_state(ROW_STATE);
|
||||
if (error)
|
||||
DBUG_RETURN(error);
|
||||
|
||||
server_id_type save_id= m_thd->server_id;
|
||||
|
Reference in New Issue
Block a user