~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/sel_arg.cc

  • Committer: Tim Penhey
  • Date: 2010-02-11 00:28:04 UTC
  • mfrom: (1271.6.2 unify_error)
  • mto: This revision was merged to the branch mainline in revision 1348.
  • Revision ID: tim@penhey.net-20100211002804-l37rv3exdak25taw
Merge prev pipe and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
22
22
#include "drizzled/optimizer/range_param.h"
23
23
#include "drizzled/optimizer/sel_arg.h"
24
24
 
25
 
using namespace drizzled;
26
 
 
 
25
namespace drizzled
 
26
{
27
27
 
28
28
/* Functions to fix up the tree after insert and delete */
29
29
static void left_rotate(optimizer::SEL_ARG **root, optimizer::SEL_ARG *leaf)
254
254
 
255
255
optimizer::SEL_ARG::SEL_ARG(optimizer::SEL_ARG &arg)
256
256
  :
257
 
    drizzled::memory::SqlAlloc()
 
257
    memory::SqlAlloc()
258
258
{
259
259
  type= arg.type;
260
260
  min_flag= arg.min_flag;
719
719
}
720
720
 
721
721
 
 
722
} /* namespace drizzled */