← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Olaf van der Spek
  • Date: 2011-08-04 08:13:04 UTC
  • mfrom: (2384 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2385.
  • Revision ID: olafvdspek@gmail.com-20110804081304-rlejjpvoos17bjdf
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table/instance/base.h
253
253
private:
254
254
  identifier::Table::Key private_key_for_cache; // This will not exist in the final design.
255
255
  std::vector<char> private_normalized_path; // This will not exist in the final design.
256
 
  LEX_STRING db;                        /* Pointer to db */
257
 
  LEX_STRING table_name;                /* Table name (for open) */
258
 
  LEX_STRING path;      /* Path to table (from datadir) */
259
 
  LEX_STRING normalized_path;           /* unpack_filename(path) */
 
256
  lex_string_t db;                        /* Pointer to db */
 
257
  lex_string_t table_name;                /* Table name (for open) */
 
258
  lex_string_t path;    /* Path to table (from datadir) */
 
259
  lex_string_t normalized_path;         /* unpack_filename(path) */
260
260
 
261
261
public:
262
262