← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_union.cc

  • Committer: Stewart Smith
  • Date: 2009-05-19 05:29:40 UTC
  • mto: (991.1.9 for-brian)
  • mto: This revision was merged to the branch mainline in revision 1033.
  • Revision ID: stewart@flamingspork.com-20090519052940-3vr2irvtzyuirh32
s/mysql_union/drizzle_union/

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_union.cc
22
22
#include <drizzled/error.h>
23
23
#include <drizzled/item/type_holder.h>
24
24
#include <drizzled/sql_base.h>
 
25
#include <drizzled/sql_union.h>
25
26
 
26
 
bool mysql_union(Session *session, LEX *, select_result *result,
27
 
                 Select_Lex_Unit *unit, uint64_t setup_tables_done_option)
 
27
bool drizzle_union(Session *session, LEX *, select_result *result,
 
28
                   Select_Lex_Unit *unit, uint64_t setup_tables_done_option)
28
29
{
29
30
  bool res;
30
31
  if (!(res= unit->prepare(session, result, SELECT_NO_UNLOCK |