mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-03 05:35:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Manual merge

Browse source 
mysql-test/r/func_test.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_row.cc:
  Auto merged
sql/item_row.h:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_select.h:
  Auto merged
This commit is contained in:
unknown 2004-02-19 01:09:54 -08:00
commit f4353d48cc
268 changed files with 6449 additions and 2960 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql/item_row.cc
View file

@ -91,7 +91,7 @@ void Item_row::split_sum_func(Item **ref_pointer_array, List<Item> &fields)
uint el= fields.elements;
fields.push_front(*arg);
ref_pointer_array[el]= *arg;
*arg= new Item_ref(ref_pointer_array + el, 0, (*arg)->name);
*arg= new Item_ref(ref_pointer_array + el, arg, 0, (*arg)->name);
}
}
}