← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_union.cc

  • Committer: Brian Aker
  • Date: 2008-11-04 15:39:09 UTC
  • mfrom: (575.1.2 devel)
  • Revision ID: brian@tangent.org-20081104153909-c72hn65udxs1ccal
Merge of Monty's work

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_union.cc
21
21
#include <drizzled/sql_select.h>
22
22
#include <drizzled/error.h>
23
23
 
24
 
bool mysql_union(Session *session,
25
 
                 LEX *lex __attribute__((unused)),
26
 
                 select_result *result,
 
24
bool mysql_union(Session *session, LEX *, select_result *result,
27
25
                 SELECT_LEX_UNIT *unit, ulong setup_tables_done_option)
28
26
{
29
27
  bool res;
40
38
** store records in temporary table for UNION
41
39
***************************************************************************/
42
40
 
43
 
int select_union::prepare(List<Item> &list __attribute__((unused)),
44
 
                          SELECT_LEX_UNIT *u)
 
41
int select_union::prepare(List<Item> &, SELECT_LEX_UNIT *u)
45
42
{
46
43
  unit= u;
47
44
  return 0;