diff options
| author | unknown <evgen@moonbone.local> | 2005-10-28 23:17:51 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2005-10-28 23:17:51 +0400 |
| commit | 32db1ff5a19f18f875b5b674b3b09dbac181ae76 (patch) | |
| tree | e4d514921a292b318d9d0cb19dc40a379c6c35f0 /sql/sql_select.h | |
| parent | ac8b32f9c07368e4d38a0ecd0564645483ef9295 (diff) | |
| parent | a7ed6ce441bd2ecdc7e12d9113b695ed3c1da45f (diff) | |
| download | mariadb-git-32db1ff5a19f18f875b5b674b3b09dbac181ae76.tar.gz | |
Manually merged
mysql-test/t/analyse.test:
Auto merged
sql/sql_select.h:
Auto merged
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index d6161eb6372..e0f4056e5da 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -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 |