← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/key.cc

  • Committer: Monty Taylor
  • Date: 2011-02-13 17:26:39 UTC
  • mfrom: (2157.2.2 give-in-to-pkg-config)
  • mto: This revision was merged to the branch mainline in revision 2166.
  • Revision ID: mordred@inaugust.com-20110213172639-nhy7i72sfhoq13ms
Merged in pkg-config fixes.

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"
24
25
 
25
26
#include <boost/dynamic_bitset.hpp>
26
27
 
329
330
     idx        Key number
330
331
*/
331
332
 
332
 
void key_unpack(String *to, Table *table, uint32_t idx)
 
333
void key_unpack(String *to, const Table *table, uint32_t idx)
333
334
{
334
335
  KeyPartInfo *key_part,*key_part_end;
335
336
  Field *field;
355
356
    {
356
357
      const CHARSET_INFO * const cs= field->charset();
357
358
      field->setReadSet();
358
 
      field->val_str(&tmp);
 
359
      field->val_str_internal(&tmp);
359
360
      if (cs->mbmaxlen > 1 &&
360
361
          table->getField(key_part->fieldnr - 1)->field_length !=
361
362
          key_part->length)