diff options
| author | evgen@moonbone.local <> | 2005-10-29 02:07:57 +0400 |
|---|---|---|
| committer | evgen@moonbone.local <> | 2005-10-29 02:07:57 +0400 |
| commit | b5d5e9a546879b938e36118875b3648fea39ccd6 (patch) | |
| tree | 2497f2cdc4186e6063a4e393bdcf6eb853d053f1 /sql/sql_select.cc | |
| parent | ddea0b44e3477c667b14450a8210eb5af0f87c6f (diff) | |
| download | mariadb-git-b5d5e9a546879b938e36118875b3648fea39ccd6.tar.gz | |
sql_select.cc:
After merge fix
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 758167e9382..af2e5879b95 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1671,7 +1671,7 @@ JOIN::exec() { thd->proc_info="Sending data"; DBUG_PRINT("info", ("%s", thd->proc_info)); - result->send_fields(*curr_fields_list, + result->send_fields(*columns_list, Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF); error= do_select(curr_join, curr_fields_list, NULL, procedure); thd->limit_found_rows= curr_join->send_records; @@ -9023,6 +9023,7 @@ do_select(JOIN *join,List<Item> *fields,TABLE *table,Procedure *procedure) int rc= 0; enum_nested_loop_state error= NESTED_LOOP_OK; JOIN_TAB *join_tab; + List<Item> *columns_list= procedure? &join->procedure_fields_list : fields; DBUG_ENTER("do_select"); join->procedure=procedure; |