diff options
| author | Alexander Barkov <bar@mysql.com> | 2010-02-27 11:43:32 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mysql.com> | 2010-02-27 11:43:32 +0400 |
| commit | 7a83782f1caa102ebc552b017885f18f005425f0 (patch) | |
| tree | 79944b66b5194acfaac9f3ba322f1403d08f0080 /sql/item_cmpfunc.cc | |
| parent | 69904fa6584b383368c94b1531e1a1a8a57f43b5 (diff) | |
| parent | 6190282adb84a0b12829671ce9c4b98a7219c809 (diff) | |
| download | mariadb-git-7a83782f1caa102ebc552b017885f18f005425f0.tar.gz | |
Mergine from mysql-next-me
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index db4a55bbcd0..08383325580 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -2866,9 +2866,7 @@ bool Item_func_case::fix_fields(THD *thd, Item **ref) buff should match stack usage from Item_func_case::val_int() -> Item_func_case::find_item() */ -#ifndef EMBEDDED_LIBRARY uchar buff[MAX_FIELD_WIDTH*2+sizeof(String)*2+sizeof(String*)*2+sizeof(double)*2+sizeof(longlong)*2]; -#endif bool res= Item_func::fix_fields(thd, ref); /* Call check_stack_overrun after fix_fields to be sure that stack variable @@ -4085,9 +4083,7 @@ Item_cond::fix_fields(THD *thd, Item **ref) DBUG_ASSERT(fixed == 0); List_iterator<Item> li(list); Item *item; -#ifndef EMBEDDED_LIBRARY uchar buff[sizeof(char*)]; // Max local vars in function -#endif not_null_tables_cache= used_tables_cache= 0; const_item_cache= 1; /* |