1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Manually merged

mysql-test/t/analyse.test:
  Auto merged
sql/sql_select.h:
  Auto merged
This commit is contained in:
unknown
2005-10-28 23:17:51 +04:00
4 changed files with 64 additions and 9 deletions

View File

@ -244,6 +244,7 @@ class JOIN :public Sql_alloc
//Part, shared with list above, emulate following list
List<Item> tmp_fields_list1, tmp_fields_list2, tmp_fields_list3;
List<Item> &fields_list; // hold field list passed to mysql_select
List<Item> procedure_fields_list;
int error;
ORDER *order, *group_list, *proc_param; //hold parameters of mysql_select