diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-11-02 12:55:46 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-02 12:55:46 +0100 |
| commit | 90b43902b0e67bcd4c6a5f08d7d76c93df74d4c8 (patch) | |
| tree | abea3216f5299f3cb53c92e6a79e37daa883b78a /sql/sys_vars.h | |
| parent | 7714adaef85cb7d83b1624db2198aec40ddefa24 (diff) | |
| download | mariadb-git-90b43902b0e67bcd4c6a5f08d7d76c93df74d4c8.tar.gz | |
compilation warnings on Windows
Diffstat (limited to 'sql/sys_vars.h')
| -rw-r--r-- | sql/sys_vars.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sql/sys_vars.h b/sql/sys_vars.h index d2a1e2360b6..b06a3eeae2d 100644 --- a/sql/sys_vars.h +++ b/sql/sys_vars.h @@ -154,12 +154,12 @@ public: } bool session_update(THD *thd, set_var *var) { - session_var(thd, T)= var->save_result.ulonglong_value; + session_var(thd, T)= static_cast<T>(var->save_result.ulonglong_value); return false; } bool global_update(THD *thd, set_var *var) { - global_var(T)= var->save_result.ulonglong_value; + global_var(T)= static_cast<T>(var->save_result.ulonglong_value); return false; } bool check_update_type(Item_result type) @@ -276,12 +276,12 @@ public: } bool session_update(THD *thd, set_var *var) { - session_var(thd, ulong)= var->save_result.ulonglong_value; + session_var(thd, ulong)= static_cast<ulong>(var->save_result.ulonglong_value); return false; } bool global_update(THD *thd, set_var *var) { - global_var(ulong)= var->save_result.ulonglong_value; + global_var(ulong)= static_cast<ulong>(var->save_result.ulonglong_value); return false; } void session_save_default(THD *thd, set_var *var) @@ -324,12 +324,12 @@ public: } bool session_update(THD *thd, set_var *var) { - session_var(thd, my_bool)= var->save_result.ulonglong_value; + session_var(thd, my_bool)= var->save_result.ulonglong_value != 0; return false; } bool global_update(THD *thd, set_var *var) { - global_var(my_bool)= var->save_result.ulonglong_value; + global_var(my_bool)= var->save_result.ulonglong_value != 0; return false; } void session_save_default(THD *thd, set_var *var) @@ -651,7 +651,7 @@ public: const char *comment, int flag_args, ptrdiff_t off, size_t size, CMD_LINE getopt, ulonglong min_val, ulonglong max_val, ulonglong def_val, - ulonglong block_size, PolyLock *lock, + uint block_size, PolyLock *lock, enum binlog_status_enum binlog_status_arg, on_check_function on_check_func, keycache_update_function on_update_func, @@ -1410,7 +1410,7 @@ public: Sys_var_session_special(const char *name_arg, const char *comment, int flag_args, CMD_LINE getopt, - ulonglong min_val, ulonglong max_val, ulonglong block_size, + ulonglong min_val, ulonglong max_val, uint block_size, PolyLock *lock, enum binlog_status_enum binlog_status_arg, on_check_function on_check_func, session_special_update_function update_func_arg, |