diff options
| author | Gleb Shchepa <gshchepa@mysql.com> | 2008-11-14 21:37:27 +0400 |
|---|---|---|
| committer | Gleb Shchepa <gshchepa@mysql.com> | 2008-11-14 21:37:27 +0400 |
| commit | fa430818c3c3cc07a2d9522236542d44d6ec50b3 (patch) | |
| tree | ac048b0a414438fee2b88cc42f19e12e666f2ec0 /sql/sql_trigger.cc | |
| parent | de1fe9054fd2dfd419c47b73ea4f3c255a4dd41a (diff) | |
| parent | b82094a0f801cd90b1954322c5e33915b362af22 (diff) | |
| download | mariadb-git-fa430818c3c3cc07a2d9522236542d44d6ec50b3.tar.gz | |
manual merge 5.0-bugteam --> 5.1-bugteam (bug 40021)
sql_view.cc: required_view_parameters has been decreased by 2
(not by 1) because its value was incorrect: 16 instead of 15
(minor performance issue).
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index 32389bde44c..5c8b1d96646 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -682,7 +682,7 @@ bool Table_triggers_list::create_trigger(THD *thd, TABLE_LIST *tables, trigname.trigger_table.length= tables->table_name_length; if (sql_create_definition_file(NULL, &trigname_file, &trigname_file_type, - (uchar*)&trigname, trigname_file_parameters, 0)) + (uchar*)&trigname, trigname_file_parameters)) return 1; /* @@ -800,7 +800,7 @@ bool Table_triggers_list::create_trigger(THD *thd, TABLE_LIST *tables, /* Create trigger definition file. */ if (!sql_create_definition_file(NULL, &file, &triggers_file_type, - (uchar*)this, triggers_file_parameters, 0)) + (uchar*)this, triggers_file_parameters)) return 0; err_with_cleanup: @@ -876,8 +876,7 @@ static bool save_trigger_file(Table_triggers_list *triggers, const char *db, TRG_EXT, 0); file.str= file_buff; return sql_create_definition_file(NULL, &file, &triggers_file_type, - (uchar*)triggers, triggers_file_parameters, - 0); + (uchar*)triggers, triggers_file_parameters); } @@ -1806,8 +1805,7 @@ Table_triggers_list::change_table_name_in_trignames(const char *db_name, trigname.trigger_table= *new_table_name; if (sql_create_definition_file(NULL, &trigname_file, &trigname_file_type, - (uchar*)&trigname, trigname_file_parameters, - 0)) + (uchar*)&trigname, trigname_file_parameters)) return trigger; } |