← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item.cc

  • Committer: Brian Aker
  • Date: 2009-02-17 00:40:38 UTC
  • mfrom: (873.2.30 devel)
  • Revision ID: brian@tangent.org-20090217004038-ivu0noxx1958wwls
Merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item.cc
297
297
                      collation.collation);
298
298
}
299
299
 
 
300
 
300
301
Item::Item():
301
302
  is_expensive_cache(-1), name(0), orig_name(0), max_length(0), name_length(0),
302
303
  unsigned_flag(false), fixed(0), is_autogenerated_name(true),
324
325
  {
325
326
    enum_parsing_place place=
326
327
      session->lex->current_select->parsing_place;
327
 
    if (place == SELECT_LIST || place == IN_HAVING)
 
328
    if (place == SELECT_LIST ||
 
329
        place == IN_HAVING)
328
330
      session->lex->current_select->select_n_having_items++;
329
331
  }
330
332
}
521
523
  {
522
524
    size_t res_length;
523
525
    name= sql_strmake_with_convert(str, name_length= length, cs,
524
 
                                   MAX_ALIAS_NAME, system_charset_info,
 
526
                                   length, system_charset_info,
525
527
                                   &res_length);
526
528
  }
527
529
  else
528
 
    name= sql_strmake(str, (name_length= cmin(length,(unsigned int)MAX_ALIAS_NAME)));
 
530
      name= sql_strmake(str, length);
529
531
}
530
532
 
531
533