1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint

Browse Source 
into  mysql.com:/home/ram/work/b23782/b23782.5.0


sql/sql_analyse.cc:
  Auto merged
This commit is contained in:
unknown 2007-02-06 17:18:43 +04:00
commit ffde1cf09c
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_analyse.cc
View File

@ -86,6 +86,11 @@ proc_analyse_init(THD *thd, ORDER *param, select_result *result,
else if (param->next) else if (param->next)
{ {
// first parameter // first parameter
if (!(*param->item)->fixed && (*param->item)->fix_fields(thd, param->item))
{
DBUG_PRINT("info", ("fix_fields() for the first parameter failed"));
goto err;
}
if ((*param->item)->type() != Item::INT_ITEM || if ((*param->item)->type() != Item::INT_ITEM ||
(*param->item)->val_real() < 0) (*param->item)->val_real() < 0)
{ {
@ -100,6 +105,11 @@ proc_analyse_init(THD *thd, ORDER *param, select_result *result,
goto err; goto err;
} }
// second parameter // second parameter
if (!(*param->item)->fixed && (*param->item)->fix_fields(thd, param->item))
{
DBUG_PRINT("info", ("fix_fields() for the second parameter failed"));
goto err;
}
if ((*param->item)->type() != Item::INT_ITEM || if ((*param->item)->type() != Item::INT_ITEM ||
(*param->item)->val_real() < 0) (*param->item)->val_real() < 0)
{ {