← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/identifier/table.cc

  • Committer: Mark Atwood
  • Date: 2012-01-04 16:59:32 UTC
  • mfrom: (2478.2.3 real-key-use-catalog)
  • Revision ID: me@mark.atwood.name-20120104165932-cm0xqs4by0u3p4cy
merge lp:~stewart/drizzle/key-use-catalog

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/identifier/table.cc
221
221
  }
222
222
 
223
223
  hash_value= util::insensitive_hash()(path);
224
 
  key.set(getKeySize(), getSchemaName(), boost::to_lower_copy(std::string(getTableName())));
 
224
  key.set(getKeySize(), getCatalogName(), getSchemaName(), boost::to_lower_copy(std::string(getTableName())));
225
225
}
226
226
 
227
227
 
284
284
  message.set_schema(getSchemaName());
285
285
}
286
286
 
287
 
void Table::Key::set(size_t resize_arg, const std::string &a, const std::string &b)
 
287
  void Table::Key::set(size_t resize_arg, const std::string &a, const std::string &b, const std::string &c)
288
288
{
289
289
  key_buffer.resize(resize_arg);
290
290
 
291
291
  std::copy(a.begin(), a.end(), key_buffer.begin());
292
292
  std::copy(b.begin(), b.end(), key_buffer.begin() + a.length() + 1);
 
293
  std::copy(c.begin(), c.end(),
 
294
            key_buffer.begin() + a.length() + 1 + b.length() + 1);
293
295
 
294
296
  util::sensitive_hash hasher;
295
297
  hash_value= hasher(key_buffer);