← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Mark Atwood
  • Date: 2011-10-05 15:24:11 UTC
  • mfrom: (2420.2.4 rf)
  • Revision ID: me@mark.atwood.name-20111005152411-xksdn4vulhmtz2x4
merge lp:~olafvdspek/drizzle/refactor1a

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
921
921
    key_info->algorithm= key->key_create_info.algorithm;
922
922
 
923
923
    uint32_t tmp_len= system_charset_info->cset->charpos(system_charset_info,
924
 
                                           key->key_create_info.comment.str,
925
 
                                           key->key_create_info.comment.str +
926
 
                                           key->key_create_info.comment.length,
 
924
                                           key->key_create_info.comment.begin(),
 
925
                                           key->key_create_info.comment.end(),
927
926
                                           INDEX_COMMENT_MAXLEN);
928
927
 
929
 
    if (tmp_len < key->key_create_info.comment.length)
 
928
    if (tmp_len < key->key_create_info.comment.size())
930
929
    {
931
 
      my_error(ER_WRONG_STRING_LENGTH, MYF(0),
932
 
               key->key_create_info.comment.str,"INDEX COMMENT",
933
 
               (uint32_t) INDEX_COMMENT_MAXLEN);
 
930
      my_error(ER_WRONG_STRING_LENGTH, MYF(0), key->key_create_info.comment.data(), "INDEX COMMENT", (uint32_t) INDEX_COMMENT_MAXLEN);
934
931
      return -1;
935
932
    }
936
933
 
937
 
    key_info->comment.length= key->key_create_info.comment.length;
 
934
    key_info->comment.length= key->key_create_info.comment.size();
938
935
    if (key_info->comment.length > 0)
939
936
    {
940
937
      key_info->flags|= HA_USES_COMMENT;
941
 
      key_info->comment.str= key->key_create_info.comment.str;
 
938
      key_info->comment.str= (char*)key->key_create_info.comment.data();
942
939
    }
943
940
 
944
941
    message::Table::Field *protofield= NULL;