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

into moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
f4e20490 · evgen@moonbone.local · 294ead9a · 162a6b42 · f4e20490
Commit f4e20490 authored Jun 03, 2007 by evgen@moonbone.local
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/item_func.cc sql/item_func.cc +2 -2

No files found.
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -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: