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

after merge fixes

Browse Source 
client/mysqldump.c:
  Fixed problem with multiple tables (--skip-quote didn't work properly for second table)
myisam/myisamchk.c:
  after merge fix
This commit is contained in:
unknown
2004-05-05 21:24:21 +03:00
parent cd21f7ce40
commit 000f76cfb8
18 changed files with 60 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sql/sql_select.cc
View File

@ -256,15 +256,19 @@ inline int setup_without_group(THD *thd, Item **ref_pointer_array,
ORDER *order,
ORDER *group, bool *hidden_group_fields)
{
bool save_allow_sum_func= thd->allow_sum_func;
bool save_allow_sum_func;
int res;
DBUG_ENTER("setup_without_group");
save_allow_sum_func= thd->allow_sum_func;
thd->allow_sum_func= 0;
int res= (setup_conds(thd, tables, conds) ||
setup_order(thd, ref_pointer_array, tables, fields, all_fields,
order) ||
setup_group(thd, ref_pointer_array, tables, fields, all_fields,
group, hidden_group_fields));
res= (setup_conds(thd, tables, conds) ||
setup_order(thd, ref_pointer_array, tables, fields, all_fields,
order) ||
setup_group(thd, ref_pointer_array, tables, fields, all_fields,
group, hidden_group_fields));
thd->allow_sum_func= save_allow_sum_func;
return res;
DBUG_RETURN(res);
}
/*****************************************************************************
@ -273,7 +277,7 @@ inline int setup_without_group(THD *thd, Item **ref_pointer_array,
*****************************************************************************/
/*
Prepare of whole select (including subselect in future).
Prepare of whole select (including sub queries in future).
return -1 on error
0 on success
*/