← 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-03 10:04:55 UTC
  • mfrom: (2382 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2384.
  • Revision ID: olafvdspek@gmail.com-20110803100455-2oqzyi77v4gykhy0
Merge trunk

Show diffs side-by-side

added added

removed removed

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