← 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-08-07 16:29:49 UTC
  • mfrom: (264.1.20 codestyle)
  • Revision ID: brian@tangent.org-20080807162949-7o8eyjgdn8ms3n1a
Merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_union.cc
13
13
   along with this program; if not, write to the Free Software
14
14
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
15
15
 
16
 
 
17
16
/*
18
17
  UNION  of select's
19
18
  UNION's  were introduced by Monty and Sinisa <sinisa@mysql.com>
20
19
*/
21
 
 
22
 
 
23
 
#include "mysql_priv.h"
24
 
#include "sql_select.h"
 
20
#include <drizzled/server_includes.h>
 
21
#include <drizzled/sql_select.h>
25
22
#include <drizzled/drizzled_error_messages.h>
26
23
 
27
24
bool mysql_union(THD *thd,