← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzledump_mysql.cc

  • Committer: Lee Bieber
  • Date: 2011-03-29 22:31:41 UTC
  • mfrom: (2257.1.3 build)
  • Revision ID: kalebral@gmail.com-20110329223141-yxc22h3l2he58sk0
Merge Andrew - 743842: Build failure using GCC 4.6
Merge Stewart - 738022: CachedDirectory silently fails to add entries if stat() fails
Merge Olaf - Common fwd: add copyright, add more declaration

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzledump_mysql.cc
291
291
      index->isPrimary= (strcmp(row[2], "PRIMARY") == 0);
292
292
      index->isUnique= (strcmp(row[1], "0") == 0);
293
293
      index->isHash= (strcmp(row[10], "HASH") == 0);
294
 
      index->length= (row[7]) ? boost::lexical_cast<uint32_t>(row[7]) : 0;
295
294
      lastKey= row[2];
296
295
      firstIndex= false;
297
296
    }
298
 
    index->columns.push_back(row[4]);
 
297
    uint32_t length= (row[7]) ? boost::lexical_cast<uint32_t>(row[7]) : 0;
 
298
    index->columns.push_back(std::make_pair(row[4], length));
299
299
  }
300
300
  if (!firstIndex)
301
301
    indexes.push_back(index);