Commit 91da3132 authored by igor@olga.mysql.com's avatar igor@olga.mysql.com
Browse files

Merge olga.mysql.com:/home/igor/mysql-5.0-opt 

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
parents 55fea25d f4e20490

sql/item_func.cc

+2 −2
Original line number Diff line number Diff line
@@ -4063,8 +4063,8 @@ bool 
Item_func_set_user_var::check(bool use_result_field)

{

  DBUG_ENTER("Item_func_set_user_var::check");

  if (use_result_field)

    DBUG_ASSERT(result_field);

  if (use_result_field && !result_field)

    use_result_field= FALSE;



  switch (cached_result_type) {

  case REAL_RESULT: