diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-08-05 15:34:19 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-08-05 15:34:19 +0300 |
| commit | ae64b6f7ab2ba58fd79ca8d808839ee41bf99f23 (patch) | |
| tree | 1f14300a8f95891aff71bf267d5b096d3f8b1ff6 /sql/sys_vars.h | |
| parent | aeeafbb39656fc4678c72b00f958215754b32dc7 (diff) | |
| parent | 7b3b8ae154da00cb35c067db62a2df57f0ea978f (diff) | |
| download | mariadb-git-ae64b6f7ab2ba58fd79ca8d808839ee41bf99f23.tar.gz | |
merge
Diffstat (limited to 'sql/sys_vars.h')
| -rw-r--r-- | sql/sys_vars.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/sys_vars.h b/sql/sys_vars.h index ca3fc99deba..ee6b429b04a 100644 --- a/sql/sys_vars.h +++ b/sql/sys_vars.h @@ -271,28 +271,28 @@ public: deprecated_version, substitute) { option.var_type= GET_ENUM; - global_var(uint)= def_val; + global_var(ulong)= def_val; DBUG_ASSERT(def_val < typelib.count); - DBUG_ASSERT(size == sizeof(uint)); + DBUG_ASSERT(size == sizeof(ulong)); } bool session_update(THD *thd, set_var *var) { - session_var(thd, uint)= var->save_result.ulonglong_value; + session_var(thd, ulong)= var->save_result.ulonglong_value; return false; } bool global_update(THD *thd, set_var *var) { - global_var(uint)= var->save_result.ulonglong_value; + global_var(ulong)= var->save_result.ulonglong_value; return false; } void session_save_default(THD *thd, set_var *var) - { var->save_result.ulonglong_value= global_var(uint); } + { var->save_result.ulonglong_value= global_var(ulong); } void global_save_default(THD *thd, set_var *var) { var->save_result.ulonglong_value= option.def_value; } uchar *session_value_ptr(THD *thd, LEX_STRING *base) - { return (uchar*)typelib.type_names[session_var(thd, uint)]; } + { return (uchar*)typelib.type_names[session_var(thd, ulong)]; } uchar *global_value_ptr(THD *thd, LEX_STRING *base) - { return (uchar*)typelib.type_names[global_var(uint)]; } + { return (uchar*)typelib.type_names[global_var(ulong)]; } }; /** |