diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-09-20 17:17:32 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-09-20 17:17:32 +0300 |
| commit | 353739fdef95fb1765dbbadf14ce1a9849a36137 (patch) | |
| tree | 4b2b7364d1e622b3b02db3fb9d0c898fb9293a87 /sql/sys_vars.h | |
| parent | 9fee5866beed47b55c5196acfa1a03503a13a2d7 (diff) | |
| parent | f4444c0016c68feb3f300c4b30b886cd407f5824 (diff) | |
| download | mariadb-git-353739fdef95fb1765dbbadf14ce1a9849a36137.tar.gz | |
merge of mysql-5.5 into mysql-5.5-wl1054
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 9dc6890a84e..3db89b3b4fa 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)]; } }; /** |