← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table/instance/base.cc

  • Committer: Stewart Smith
  • Date: 2011-12-27 05:13:55 UTC
  • mto: This revision was merged to the branch mainline in revision 2484.
  • Revision ID: stewart@flamingspork.com-20111227051355-ekct91ewmatpjx8i
ensure that Table::Key has the CATALOG along with SCHEMA and TABLE_NAME in it. Modify the (not so great) code in Table and TableShare to handle this too. This is one of the precursors for proper CATALOG support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table/instance/base.cc
335
335
  table_category=         TABLE_CATEGORY_TEMPORARY;
336
336
  tmp_table=              message::Table::INTERNAL;
337
337
 
338
 
  db= str_ref(private_key_for_cache.vector());
 
338
  db= str_ref(private_key_for_cache.vector() + strlen(private_key_for_cache.vector()) + 1);
339
339
 
340
 
  table_name= str_ref(private_key_for_cache.vector() + strlen(private_key_for_cache.vector()) + 1);
 
340
  table_name= str_ref(db.data() + strlen(db.data()) + 1);
341
341
  path= str_ref("");
342
342
  normalized_path= str_ref("");
343
343
 
469
469
    Let us use the fact that the key is "db/0/table_name/0" + optional
470
470
    part for temporary tables.
471
471
  */
472
 
  db= str_ref(private_key_for_cache.vector());
 
472
  db= str_ref(private_key_for_cache.vector() + strlen(private_key_for_cache.vector()) + 1);
473
473
  table_name= str_ref(db.data() + db.size() + 1);
474
474
 
475
475
  std::string _path;
514
514
    Let us use the fact that the key is "db/0/table_name/0" + optional
515
515
    part for temporary tables.
516
516
  */
517
 
  db= str_ref(private_key_for_cache.vector());
 
517
  db= str_ref(private_key_for_cache.vector() + strlen(private_key_for_cache.vector()) + 1);
518
518
  table_name= str_ref(db.data() + db.size() + 1);
519
519
 
520
520
  getTableMessage()->set_name(identifier_arg.getTableName());