← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_list.h

  • Committer: Olaf van der Spek
  • Date: 2011-08-05 12:55:59 UTC
  • mto: This revision was merged to the branch mainline in revision 2395.
  • Revision ID: olafvdspek@gmail.com-20110805125559-fip89v61zimhde1b
Rename set_db to set_schema

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_list.h
62
62
    next_local(NULL),
63
63
    next_global(NULL),
64
64
    prev_global(NULL),
65
 
    db(NULL),
66
65
    alias(NULL),
67
66
    option(NULL),
68
67
    on_expr(NULL),
85
84
    select_lex(NULL),
86
85
    next_leaf(NULL),
87
86
    outer_join(0),
88
 
    db_length(0),
89
87
    dep_tables(0),
90
88
    on_expr_dep_tables(0),
91
89
    nested_join(NULL),
97
95
    is_fqtn(false),
98
96
    create(false)
99
97
  {
 
98
    schema.clear();
100
99
    table_name.clear();
101
100
  }
102
101
 
112
111
  TableList **prev_global;
113
112
 
114
113
private:
115
 
  const char *db;
 
114
  str_ref schema;
116
115
 
117
116
public:
118
117
  const char *getSchemaName() const
119
118
  {
120
 
    return db;
121
 
  }
122
 
 
123
 
  const char** getSchemaNamePtr()
124
 
  {
125
 
    return &db;
 
119
    return schema.data();
126
120
  }
127
121
 
128
122
  void setSchemaName(str_ref v)
129
123
  {
130
 
    db= v.data();
131
 
    db_length= v.size();
 
124
    schema= v;
132
125
  }
133
126
 
134
127
  const char *alias;
221
214
  TableList *next_leaf;
222
215
  thr_lock_type lock_type;
223
216
  uint32_t outer_join; ///< Which join type
224
 
  size_t db_length;
225
217
 
226
218
  void set_underlying_merge();
227
219
  bool setup_underlying(Session *session);
378
370
  friend std::ostream& operator<<(std::ostream& output, const TableList &list)
379
371
  {
380
372
    output << "TableList:(";
381
 
    output << list.db;
 
373
    output << list.getSchemaName();
382
374
    output << ", ";
383
375
    output << list.getTableName();
384
376
    output << ", ";