← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/key.cc

  • Committer: Brian Aker
  • Date: 2010-10-28 17:12:01 UTC
  • mfrom: (1887.1.3 merge)
  • Revision ID: brian@tangent.org-20101028171201-baj6l1bnntn1s4ad
Merge in POTFILES changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/key.cc
21
21
#include "drizzled/key.h"
22
22
#include "drizzled/field/blob.h"
23
23
#include "drizzled/util/test.h"
24
 
#include "drizzled/plugin/storage_engine.h"
25
24
 
26
25
#include <boost/dynamic_bitset.hpp>
27
26
 
330
329
     idx        Key number
331
330
*/
332
331
 
333
 
void key_unpack(String *to, const Table *table, uint32_t idx)
 
332
void key_unpack(String *to, Table *table, uint32_t idx)
334
333
{
335
334
  KeyPartInfo *key_part,*key_part_end;
336
335
  Field *field;
356
355
    {
357
356
      const CHARSET_INFO * const cs= field->charset();
358
357
      field->setReadSet();
359
 
      field->val_str_internal(&tmp);
 
358
      field->val_str(&tmp);
360
359
      if (cs->mbmaxlen > 1 &&
361
360
          table->getField(key_part->fieldnr - 1)->field_length !=
362
361
          key_part->length)