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_func.cc | |
| parent | 69904fa6584b383368c94b1531e1a1a8a57f43b5 (diff) | |
| parent | 6190282adb84a0b12829671ce9c4b98a7219c809 (diff) | |
| download | mariadb-git-7a83782f1caa102ebc552b017885f18f005425f0.tar.gz | |
Mergine from mysql-next-me
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 0a572a8f3e3..ca8f5d00bb1 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -151,9 +151,7 @@ Item_func::fix_fields(THD *thd, Item **ref) { DBUG_ASSERT(fixed == 0); Item **arg,**arg_end; -#ifndef EMBEDDED_LIBRARY // Avoid compiler warning uchar buff[STACK_BUFF_ALLOC]; // Max argument in function -#endif used_tables_cache= not_null_tables_cache= 0; const_item_cache=1; @@ -2848,9 +2846,7 @@ bool udf_handler::fix_fields(THD *thd, Item_result_field *func, uint arg_count, Item **arguments) { -#ifndef EMBEDDED_LIBRARY // Avoid compiler warning uchar buff[STACK_BUFF_ALLOC]; // Max argument in function -#endif DBUG_ENTER("Item_udf_func::fix_fields"); if (check_stack_overrun(thd, STACK_MIN_SIZE, buff)) |