diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-08-27 20:00:18 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-08-27 20:00:18 +0300 |
| commit | c637296ceaf315d66011d0eeeae4765294fff060 (patch) | |
| tree | 9e95c1a8621bfb7a8f2c88c42378e6f07a07ebe4 /sql/item_func.cc | |
| parent | b43a551e83c20dc647a56036ad76811bb09a4945 (diff) | |
| download | mariadb-git-c637296ceaf315d66011d0eeeae4765294fff060.tar.gz | |
Fixed unlikely stack bug when having a BIG expression of type 1+1-1+1-1... in certain combinations. Bug #871
sql-bench/limits/mysql.cfg:
Updated limits
sql/item_cmpfunc.cc:
Test for stack checking
sql/item_func.cc:
Test for stack checking
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index be5d98f20ec..3b1a35e4d08 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -68,7 +68,7 @@ Item_func::fix_fields(THD *thd,TABLE_LIST *tables) const_item_cache=1; if (thd && check_stack_overrun(thd,buff)) - return 0; // Fatal error if flag is set! + return 1; // Fatal error if flag is set! if (arg_count) { // Print purify happy for (arg=args, arg_end=args+arg_count; arg != arg_end ; arg++) @@ -1170,7 +1170,7 @@ udf_handler::fix_fields(THD *thd,TABLE_LIST *tables,Item_result_field *func, if (thd) { if (check_stack_overrun(thd,buff)) - return 0; // Fatal error flag is set! + DBUG_RETURN(1); // Fatal error flag is set! } else thd=current_thd; // In WHERE / const clause |