diff options
| author | Monty <monty@mariadb.org> | 2016-10-02 16:39:40 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-10-05 01:11:08 +0300 |
| commit | 7b96416f3c43f02240864f378513330b85f49521 (patch) | |
| tree | e4fa5f570965d5cc36e983275e08f36431a4a654 /sql/sql_trigger.cc | |
| parent | 8be53a389c8eebed337057fa366b7c4506ba16b1 (diff) | |
| download | mariadb-git-7b96416f3c43f02240864f378513330b85f49521.tar.gz | |
Use sql_mode_t for sql_mode.
This fixed several cases where we where using just ulong for sql_mode
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index d3954d0ee73..7dbc8513418 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -1388,7 +1388,7 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db, information about mode in old format. */ sql_mode= ((trg_sql_mode= itm++) ? *trg_sql_mode : - global_system_variables.sql_mode); + (ulonglong) global_system_variables.sql_mode); trg_create_time= it_create_times++; // May be NULL if old file trg_definer= it_definer++; // May be NULL if old file @@ -1871,7 +1871,7 @@ Table_triggers_list::change_table_name_in_triggers(THD *thd, LEX_STRING *new_table_name) { struct change_table_name_param param; - ulonglong save_sql_mode= thd->variables.sql_mode; + sql_mode_t save_sql_mode= thd->variables.sql_mode; char path_buff[FN_REFLEN]; param.thd= thd; |