← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Mark Atwood
  • Date: 2011-06-25 15:38:53 UTC
  • mfrom: (2318.6.78 refactor16)
  • Revision ID: me@mark.atwood.name-20110625153853-za5fjiwd3z0aykdd
merge lp:~olafvdspek/drizzle/refactor16

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
4224
4224
         one row).  The sorting doesn't matter.
4225
4225
        */
4226
4226
        if (key_part == key_part_end && reverse == 0)
4227
 
          return(1);
 
4227
          return 1;
4228
4228
      }
4229
4229
      else
4230
4230
        return 0;
5073
5073
  cursor->extra(HA_EXTRA_NO_CACHE);
5074
5074
  if (error)
5075
5075
    table->print_error(error,MYF(0));
5076
 
  return(1);
 
5076
  return 1;
5077
5077
}
5078
5078
 
5079
5079
/**
6235
6235
{
6236
6236
  /* List is reversed => we should reverse it before using */
6237
6237
  List<TableList>::iterator ti(tables->begin());
6238
 
  TableList **table= (TableList **)session->mem.alloc(sizeof(TableList*) * tables->size());
 
6238
  TableList **table= new (session->mem) TableList*[tables->size()];
6239
6239
 
6240
6240
  for (TableList **t= table + (tables->size() - 1); t >= table; t--)
6241
6241
    *t= ti++;