diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-12-17 15:05:50 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-12-17 15:05:50 +0200 |
| commit | 2969956def0cec89d2e498083dc88ecb5b94291b (patch) | |
| tree | cf85dbae9b4ee145b5311bbaac487c5fd4b66087 /sql/item_func.cc | |
| parent | 3cdd4ba388310f49d0e57089b9923f33dbdd1606 (diff) | |
| parent | 13c6af0eab384632e3cb954e5ba7d7c51d537d4f (diff) | |
| download | mariadb-git-2969956def0cec89d2e498083dc88ecb5b94291b.tar.gz | |
merge
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 5a8f65a795a..1f354009f72 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -4876,7 +4876,7 @@ void Item_func_get_system_var::fix_length_and_dec() decimals=0; break; case SHOW_LONGLONG: - unsigned_flag= FALSE; + unsigned_flag= TRUE; max_length= MY_INT64_NUM_DECIMAL_DIGITS; decimals=0; break; @@ -5017,7 +5017,7 @@ longlong Item_func_get_system_var::val_int() { case SHOW_INT: get_sys_var_safe (uint); case SHOW_LONG: get_sys_var_safe (ulong); - case SHOW_LONGLONG: get_sys_var_safe (longlong); + case SHOW_LONGLONG: get_sys_var_safe (ulonglong); case SHOW_HA_ROWS: get_sys_var_safe (ha_rows); case SHOW_BOOL: get_sys_var_safe (bool); case SHOW_MY_BOOL: get_sys_var_safe (my_bool); @@ -6066,7 +6066,7 @@ Item_func_sp::fix_fields(THD *thd, Item **ref) if (res) DBUG_RETURN(res); - if (thd->lex->view_prepare_mode) + if (thd->lex->context_analysis_only & CONTEXT_ANALYSIS_ONLY_VIEW) { /* Here we check privileges of the stored routine only during view |