database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1

Browse Source 
into sanja.is.com.ua:/home/bell/mysql/work-cols-4.1


sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
This commit is contained in:
unknown
2003-01-21 15:31:04 +02:00
parent 93311f2baf a5bdc2e561
commit aec72f3315
8 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_select.cc
View File

@ -714,6 +714,13 @@ JOIN::exec()
int tmp_error;
DBUG_ENTER("JOIN::exec");
if (procedure)
{
if (procedure->change_columns(fields_list) ||
result->prepare(fields_list, unit))
DBUG_VOID_RETURN;
}
if (!tables_list)
{ // Only test of functions
@ -768,8 +775,6 @@ JOIN::exec()
test_if_skip_sort_order(&join_tab[const_tables], order,
select_limit, 0))))
order=0;
if (procedure)
(void)result->prepare(fields_list, unit);
select_describe(this, need_tmp,
order != 0 && !skip_sort_order,
select_distinct);
@ -989,9 +994,6 @@ JOIN::exec()
}
if (procedure)
{
if (procedure->change_columns(fields_list) ||
result->prepare(fields_list, unit))
DBUG_VOID_RETURN;
count_field_types(&tmp_table_param, all_fields, 0);
}
if (group || tmp_table_param.sum_func_count ||