Bug#20836 Selecting into variables results in wrong results being returned

- Post-merge cleanup.
- Disabled this bug's test for 5.x until 16861 is resolved.


mysql-test/r/distinct.result:
  Bug#20836 Selecting into variables results in wrong results being returned
  - Remove results for this bug.  When bug number 16861 is resolved, the result
  should match the 4.1 result.
mysql-test/t/distinct.test:
  Bug#20836 Selecting into variables results in wrong results being returned
  - Disable the test for 20836.  This test should remain disabled until bug 16861
  is fixed.  The results for the test should be the same as in 4.1.
sql/sql_class.cc:
  Bug#20836 Selecting into variables results in wrong results being returned
  - Post-merge cleanup.

1 files changed, 5 insertions, 7 deletions

diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index a1ad76f84e4..f3c450d28f5 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -1853,13 +1853,12 @@ bool select_dumpvar::send_data(List<Item> &items)
   {
     if (mv->local)
     {
-      if (thd->spcont->set_variable(current_thd, yy->get_var_idx(),
-                                      it.ref()))
-	  DBUG_RETURN(1);
+      if (thd->spcont->set_variable(thd, mv->offset, &item))
+	    DBUG_RETURN(1);
     }
     else
     {
-      Item_func_set_user_var *suv= new Item_func_set_user_var(*ls, item);
+      Item_func_set_user_var *suv= new Item_func_set_user_var(mv->s, item);
 
       /*
         Item_func_set_user_var can't substitute something else on its
@@ -1868,9 +1867,8 @@ bool select_dumpvar::send_data(List<Item> &items)
         we do not check var->fixed
       */
 
-      suv->fix_fields(thd, (TABLE_LIST *) thd->lex->select_lex.table_list.first,
-            0);
-      suv->check();
+      suv->fix_fields(thd, 0);
+      suv->check(0);
       suv->update();
     }
   }