diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-11-22 18:04:38 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-22 18:04:38 +0100 |
| commit | d2755a2c9c109ddb4e2e0c9feda89431a6c4fd50 (patch) | |
| tree | c6e4678908c750d7f558e98cedc349aa1d350892 /sql/item_func.cc | |
| parent | af32b02c06f32a89dc9f52e556bc5dd3bf49c19e (diff) | |
| parent | 42221abaed700f6dc5d280b462755851780e8487 (diff) | |
| download | mariadb-git-d2755a2c9c109ddb4e2e0c9feda89431a6c4fd50.tar.gz | |
5.3->5.5 merge
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 1c6a9c23b26..c771bfbf133 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -177,9 +177,7 @@ Item_func::fix_fields(THD *thd, Item **ref) { DBUG_ASSERT(fixed == 0); Item **arg,**arg_end; - TABLE_LIST *save_emb_on_expr_nest= thd->thd_marker.emb_on_expr_nest; uchar buff[STACK_BUFF_ALLOC]; // Max argument in function - thd->thd_marker.emb_on_expr_nest= NULL; used_tables_cache= not_null_tables_cache= 0; const_item_cache=1; @@ -233,7 +231,6 @@ Item_func::fix_fields(THD *thd, Item **ref) if (thd->is_error()) // An error inside fix_length_and_dec occured return TRUE; fixed= 1; - thd->thd_marker.emb_on_expr_nest= save_emb_on_expr_nest; return FALSE; } @@ -5497,7 +5494,7 @@ void Item_func_get_system_var::fix_length_and_dec() case SHOW_LONG: case SHOW_INT: case SHOW_HA_ROWS: - unsigned_flag= TRUE; + unsigned_flag= TRUE; //var->show_type() != SHOW_INT; collation.set_numeric(); fix_char_length(MY_INT64_NUM_DECIMAL_DIGITS); decimals=0; |