← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/schema_dictionary/indexes.cc

  • Committer: Brian Aker
  • Date: 2010-05-26 21:49:18 UTC
  • mto: This revision was merged to the branch mainline in revision 1568.
  • Revision ID: brian@gaz-20100526214918-8kdibq48e9lnyr6t
https://launchpad.net/bugs/586009
This fixes bug 586009, increases the size of the log files so that the UNION
test doesn't hit Innodb's default limit. Increases the size of the initial
Innodb data file, and fixes one case where an empty string on error was
causing a crash on OSX.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/schema_dictionary/indexes.cc
30
30
  add_field("TABLE_SCHEMA");
31
31
  add_field("TABLE_NAME");
32
32
  add_field("INDEX_NAME");
33
 
  add_field("IS_USED_IN_PRIMARY", plugin::TableFunction::BOOLEAN, 0, false);
34
 
  add_field("IS_UNIQUE", plugin::TableFunction::BOOLEAN, 0, false);
35
 
  add_field("IS_NULLABLE", plugin::TableFunction::BOOLEAN, 0, false);
36
 
  add_field("KEY_LENGTH", plugin::TableFunction::NUMBER, 0, false);
 
33
  add_field("IS_USED_IN_PRIMARY", plugin::TableFunction::BOOLEAN);
 
34
  add_field("IS_UNIQUE", plugin::TableFunction::BOOLEAN);
 
35
  add_field("IS_NULLABLE", plugin::TableFunction::BOOLEAN);
 
36
  add_field("KEY_LENGTH", plugin::TableFunction::NUMBER);
37
37
  add_field("INDEX_TYPE");
38
38
  add_field("INDEX_COMMENT", plugin::TableFunction::STRING, 1024, true);
39
39
}
142
142
      length= sizeof("FULLTEXT");
143
143
      break;
144
144
    }
145
 
    /* Subtract 1 here, because sizeof gives us the wrong amount */
146
 
    push(str, length - 1);
 
145
    push(str, length);
147
146
  }
148
147
 
149
148
 /* "INDEX_COMMENT" */