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/sys_vars.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/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 7f4d988b072..e88ec1e374f 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -3001,7 +3001,7 @@ static Sys_var_ulonglong Sys_sort_buffer( VALID_RANGE(MIN_SORT_MEMORY, SIZE_T_MAX), DEFAULT(MAX_SORT_MEMORY), BLOCK_SIZE(1)); -export ulonglong expand_sql_mode(ulonglong sql_mode) +export sql_mode_t expand_sql_mode(sql_mode_t sql_mode) { if (sql_mode & MODE_ANSI) { @@ -3055,7 +3055,7 @@ export ulonglong expand_sql_mode(ulonglong sql_mode) static bool check_sql_mode(sys_var *self, THD *thd, set_var *var) { var->save_result.ulonglong_value= - expand_sql_mode(var->save_result.ulonglong_value); + (ulonglong) expand_sql_mode(var->save_result.ulonglong_value); return false; } static bool fix_sql_mode(sys_var *self, THD *thd, enum_var_type type) |