Commit f4e20490 authored by evgen@moonbone.local's avatar evgen@moonbone.local
Browse files

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 

into  moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
parents 294ead9a 162a6b42

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: