After-merge fixes.

2e76d50a · unknown · 049a5800 · 2e76d50a
Commit 2e76d50a authored May 15, 2006 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/sp_head.cc sql/sp_head.cc +1 -1

No files found.
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -321,7 +321,7 @@ sp_eval_expr(THD *thd, Field *result_field, Item **expr_item_ptr)

  DBUG_ENTER("sp_eval_expr");

-  if (!expr_item)
+  if (!*expr_item_ptr)
    DBUG_RETURN(TRUE);

  if (!(expr_item= sp_prepare_func_item(thd, expr_item_ptr)))