← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_list.h

  • Committer: Mark Atwood
  • Date: 2011-08-11 03:05:03 UTC
  • mfrom: (2385.1.12 refactor4)
  • Revision ID: me@mark.atwood.name-20110811030503-rp9xjihc5x3y0x4q
merge lp:~olafvdspek/drizzle/refactor4

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),
 
65
    schema(NULL),
66
66
    alias(NULL),
67
67
    table_name(NULL),
68
68
    option(NULL),
86
86
    select_lex(NULL),
87
87
    next_leaf(NULL),
88
88
    outer_join(0),
89
 
    db_length(0),
90
 
    table_name_length(0),
91
89
    dep_tables(0),
92
90
    on_expr_dep_tables(0),
93
91
    nested_join(NULL),
98
96
    is_alias(false),
99
97
    is_fqtn(false),
100
98
    create(false)
101
 
  {}
 
99
  {
 
100
  }
102
101
 
103
102
  /**
104
103
   * List of tables local to a subquery (used by SQL_LIST). Considers
112
111
  TableList **prev_global;
113
112
 
114
113
private:
115
 
  const char *db;
 
114
  const char* 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;
126
 
  }
127
 
 
128
 
  void setSchemaName(const char *arg, size_t arg_size)
129
 
  {
130
 
    db= arg;
131
 
    db_length= arg_size;
 
119
    return schema;
 
120
  }
 
121
 
 
122
  void setSchemaName(const char* v)
 
123
  {
 
124
    schema= v;
132
125
  }
133
126
 
134
127
  const char *alias;
135
128
 
136
129
private:
137
 
  const char *table_name;
 
130
  const char* table_name;
138
131
 
139
132
public:
140
133
  const char *getTableName() const
142
135
    return table_name;
143
136
  }
144
137
 
145
 
  void setTableName(const char *arg, size_t arg_size)
 
138
  void setTableName(const char* v)
146
139
  {
147
 
    table_name= arg;
148
 
    table_name_length= arg_size;
 
140
    table_name= v;
149
141
  }
150
142
 
151
143
  const char *option; ///< Used by cache index
222
214
  TableList *next_leaf;
223
215
  thr_lock_type lock_type;
224
216
  uint32_t outer_join; ///< Which join type
225
 
  size_t db_length;
226
 
  size_t table_name_length;
227
217
 
228
218
  void set_underlying_merge();
229
219
  bool setup_underlying(Session *session);
380
370
  friend std::ostream& operator<<(std::ostream& output, const TableList &list)
381
371
  {
382
372
    output << "TableList:(";
383
 
    output << list.db;
 
373
    output << list.getSchemaName();
384
374
    output << ", ";
385
 
    output << list.table_name;
 
375
    output << list.getTableName();
386
376
    output << ", ";
387
377
    output << list.alias;
388
378
    output << ", ";