database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

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

Browse Source 
- 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.
This commit is contained in:
unknown
2006-11-30 13:09:48 -05:00
parent 0e6675479d
commit 1c49e88e4c
3 changed files with 68 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_class.cc
View File

@@ -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();
}
}