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

into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728

Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
91da3132 · igor@olga.mysql.com · 55fea25d · f4e20490 · 91da3132
Commit 91da3132 authored Jun 02, 2007 by igor@olga.mysql.com
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: