← Back to branch summary

~posulliv/drizzle/memcached_applier

« back to all changes in this revision

Viewing changes to drizzled/item.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item.cc
498
498
                            str + length - orig_len);
499
499
    }
500
500
  }
501
 
  if (!my_charset_same(cs, system_charset_info))
502
 
  {
503
 
    size_t res_length;
504
 
    name= sql_strmake_with_convert(str, name_length= length, cs,
505
 
                                   length, system_charset_info,
506
 
                                   &res_length);
507
 
  }
508
 
  else
509
 
      name= sql_strmake(str, length);
 
501
  name= sql_strmake(str, length);
510
502
}
511
503
 
512
504
 
1576
1568
  {
1577
1569
    String *res;
1578
1570
    if ((res=val_str(buffer)))
1579
 
      result= protocol->store(res->ptr(),res->length(),res->charset());
 
1571
      result= protocol->store(res->ptr(),res->length());
1580
1572
    break;
1581
1573
  }
1582
1574
  case DRIZZLE_TYPE_LONG: