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

into mysql.com:/home/ram/work/b23782/b23782.5.1 sql/sql_analyse.cc: Auto merged
19 years ago · c406b25e3d
1 changed files with 10 additions and 0 deletions
--- a/sql/sql_analyse.cc
+++ b/sql/sql_analyse.cc
@ -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)
    {