← Back to branch summary

~patrick-crews/drizzle/qp-initial-cleanup

« back to all changes in this revision

Viewing changes to plugin/tableprototester/tableprototester.cc

  • Committer: Continuous Integration
  • Date: 2012-04-23 09:10:11 UTC
  • mfrom: (2546.1.6 drizzle-greenlake)
  • Revision ID: ci@drizzle.org-20120423091011-occ5xj26cv99opu6
modified:
  client/conclusions.h
  client/drizzledump.cc
  client/drizzledump_data.h
  client/drizzledump_drizzle.cc
  client/drizzledump_mysql.cc
  client/drizzleimport.cc
  client/include.am
  client/option_string.h
  client/server_detect.cc
  client/statement.h
  client/stats.h
  client/thread_context.h
  drizzled/identifier/catalog.cc
  drizzled/identifier/constants/schema.cc
  drizzled/identifier/schema.cc
  drizzled/identifier/table.cc
  drizzled/include.am
  drizzled/main.cc
  plugin/innobase/dict/dict0dict.cc
  plugin/innobase/handler/ha_innodb.cc
  plugin/innobase/plugin.am
  plugin/innobase/tests/r/innodb-system-table-view.result
  plugin/tableprototester/tableprototester.cc
  tests/r/broken_table_proto_file.result
  unittests/include.am
pending merge tips: (use -v to see all merge revisions)
  Brian Aker 2012-04-23 Update to add in dependency for unittest

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/tableprototester/tableprototester.cc
118
118
 
119
119
bool TableProtoTesterEngine::doDoesTableExist(Session&, const drizzled::identifier::Table &identifier)
120
120
{
121
 
  if (not identifier.getPath().compare("test/t1"))
122
 
    return true;
123
 
  if (not identifier.getPath().compare("test/too_many_enum_values"))
124
 
    return true;
125
 
  if (not identifier.getPath().compare("test/invalid_table_collation"))
 
121
  if (not identifier.getPath().compare("local/test/t1"))
 
122
    return true;
 
123
  if (not identifier.getPath().compare("local/test/too_many_enum_values"))
 
124
    return true;
 
125
  if (not identifier.getPath().compare("local/test/invalid_table_collation"))
126
126
    return true;
127
127
 
128
128
  return false;
239
239
                                                 const drizzled::identifier::Table &identifier,
240
240
                                                 drizzled::message::Table &table_proto)
241
241
{
242
 
  if (not identifier.getPath().compare("test/t1"))
 
242
  if (not identifier.getPath().compare("local/test/t1"))
243
243
  {
244
244
    fill_table1(table_proto);
245
245
    return EEXIST;
246
246
  }
247
 
  else if (not identifier.getPath().compare("test/too_many_enum_values"))
 
247
  else if (not identifier.getPath().compare("local/test/too_many_enum_values"))
248
248
  {
249
249
    fill_table_too_many_enum_values(table_proto);
250
250
    return EEXIST;
251
251
  }
252
 
  else if (not identifier.getPath().compare("test/invalid_table_collation"))
 
252
  else if (not identifier.getPath().compare("local/test/invalid_table_collation"))
253
253
  {
254
254
    fill_table_invalid_table_collation(table_proto);
255
255
    return EEXIST;