~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_olap.cc

  • Committer: Eric Herman
  • Date: 2008-12-06 19:42:46 UTC
  • mto: (656.1.6 devel)
  • mto: This revision was merged to the branch mainline in revision 665.
  • Revision ID: eric@mysql.com-20081206194246-5cdexuu81i366eek
removed trailing whitespace with simple script:

for file in $(find . -name "*.c") $(find . -name "*.cc") $(find . -name "*.h"); do ruby -pe 'gsub(/\s+$/, $/)' < $file > $file.out; mv $file.out $file; done;

Show diffs side-by-side

added added

removed removed

Lines of Context:
52
52
  new_select->group_list.first=(unsigned char *)0;
53
53
  new_select->group_list.next=(unsigned char **)&new_select->group_list.first;
54
54
  List<Item> privlist;
55
 
  
 
55
 
56
56
  List_iterator<Item> list_it(select_lex->item_list);
57
57
  List_iterator<Item> new_it(new_fields);
58
 
    
 
58
 
59
59
  while ((item=list_it++))
60
60
  {
61
61
    bool not_found= true;
65
65
      new_it.rewind();
66
66
      while ((new_item=new_it++))
67
67
      {
68
 
        if (new_item->type()==Item::FIELD_ITEM && 
 
68
        if (new_item->type()==Item::FIELD_ITEM &&
69
69
            !strcmp(((Item_field*)new_item)->table_name,iif->table_name) &&
70
70
            !strcmp(((Item_field*)new_item)->field_name,iif->field_name))
71
71
        {
99
99
  Returns 0 if OK, 1 if error, -1 if error already printed to client
100
100
****************************************************************************/
101
101
 
102
 
static int  olap_combos(List<Item> old_fields, List<Item> new_fields, Item *item, LEX *lex, 
103
 
                              SELECT_LEX *select_lex, int position, int selection, int num_fields, 
 
102
static int  olap_combos(List<Item> old_fields, List<Item> new_fields, Item *item, LEX *lex,
 
103
                              SELECT_LEX *select_lex, int position, int selection, int num_fields,
104
104
                              int num_new_fields)
105
105
{
106
106
  int sl_return = 0;
126
126
 
127
127
/****************************************************************************
128
128
  Top level function for converting OLAP clauses to multiple selects
129
 
  This is also a place where clauses treatment depends on OLAP type 
 
129
  This is also a place where clauses treatment depends on OLAP type
130
130
  Returns 0 if OK, 1 if error, -1 if error already printed to client
131
131
****************************************************************************/
132
132