database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

cleanup

Browse Source 
* move common code to a new set_bad_null_error() function
* move repeated comparison out of the loop
* remove unused code
  * unused method Table_triggers_list::set_table
  * redundant condition (if (table) after table was dereferenced)
* add an assert
This commit is contained in:
Sergei Golubchik
2015-12-16 12:12:01 +01:00
parent de7636e147
commit ad5db17e88
8 changed files with 43 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sql/sql_trigger.cc
View File

@ -1100,20 +1100,6 @@ bool Table_triggers_list::prepare_record1_accessors(TABLE *table)
}
/**
Adjust Table_triggers_list with new TABLE pointer.
@param new_table new pointer to TABLE instance
*/
void Table_triggers_list::set_table(TABLE *new_table)
{
trigger_table= new_table;
for (Field **field= new_table->triggers->record1_field ; *field ; field++)
(*field)->init(new_table);
}
/**
Check whenever .TRG file for table exist and load all triggers it contains.
@ -2125,6 +2111,7 @@ bool Table_triggers_list::process_triggers(THD *thd,
}
else
{
DBUG_ASSERT(event == TRG_EVENT_DELETE);
new_field= record1_field;
old_field= trigger_table->field;
}