← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbms/src/discover_ms.cc

  • Committer: Olaf van der Spek
  • Date: 2011-08-04 08:13:04 UTC
  • mfrom: (2384 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2385.
  • Revision ID: olafvdspek@gmail.com-20110804081304-rlejjpvoos17bjdf
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbms/src/discover_ms.cc
552
552
  {
553
553
    DBUG_PRINT("info", ("key name: '%s'  type: %d", key->DOT_STR(name) ? key->DOT_STR(name) :
554
554
                        "(none)" , key->type));
555
 
    LEX_STRING key_name_str;
 
555
    lex_string_t key_name_str;
556
556
    if (key->type == Key::FOREIGN_KEY)
557
557
    {
558
558
      fk_key_count++;
1298
1298
        
1299
1299
        /* setup the column info. */
1300
1300
        while (info->field_name) {              
1301
 
                 LEX_STRING field_name, comment;                 
 
1301
                 lex_string_t field_name, comment;               
1302
1302
                 field_name.str = (char*)(info->field_name);
1303
1303
                 field_name.length = strlen(info->field_name);
1304
1304
                 
1328
1328
        if (keys) {
1329
1329
#ifdef HAVE_KEYS
1330
1330
                while (keys->key_name) {
1331
 
                        LEX_STRING lex;
 
1331
                        lex_string_t lex;
1332
1332
                        Key *key;
1333
1333
                        enum Key::Keytype type;
1334
1334
                        List<Key_part_spec> col_list;