← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/create.cc

  • Committer: Brian Aker
  • Date: 2009-05-15 19:36:46 UTC
  • mfrom: (1022.1.3 merge)
  • Revision ID: brian@gaz-20090515193646-g0vvy78rkk08e440
Merge in changes for charset and dead code cleanup.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/create.cc
2711
2711
  if (cs->mbminlen > 1)
2712
2712
  {
2713
2713
    uint32_t dummy_errors;
2714
 
    sp= new (session->mem_root) Item_string("", 0, cs, DERIVATION_COERCIBLE, MY_REPERTOIRE_ASCII);
 
2714
    sp= new (session->mem_root) Item_string("", 0, cs, DERIVATION_COERCIBLE);
2715
2715
    sp->str_value.copy(" ", 1, &my_charset_utf8_general_ci, cs, &dummy_errors);
2716
2716
  }
2717
2717
  else
2718
2718
  {
2719
 
    sp= new (session->mem_root) Item_string(" ", 1, cs, DERIVATION_COERCIBLE, MY_REPERTOIRE_ASCII);
 
2719
    sp= new (session->mem_root) Item_string(" ", 1, cs, DERIVATION_COERCIBLE);
2720
2720
  }
2721
2721
 
2722
2722
  return new (session->mem_root) Item_func_repeat(sp, arg1);