Commit ffde1cf0 authored by unknown's avatar unknown
Browse files

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

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


sql/sql_analyse.cc:
  Auto merged
parents e976ea37 07efbe8c

sql/sql_analyse.cc

+10 −0
Original line number Diff line number Diff line
@@ -86,6 +86,11 @@ proc_analyse_init(THD *thd, ORDER *param, select_result *result, 
  else if (param->next)

  {

    // 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 ||

	(*param->item)->val_real() < 0)

    {
@@ -100,6 +105,11 @@ proc_analyse_init(THD *thd, ORDER *param, select_result *result, 
      goto err;

    }

    // 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 ||

	(*param->item)->val_real() < 0)

    {