← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/schema_dictionary/tables.cc

  • Committer: Eric Day
  • Date: 2010-03-25 19:28:37 UTC
  • mfrom: (1405 staging)
  • mto: This revision was merged to the branch mainline in revision 1409.
  • Revision ID: eday@oddments.org-20100325192837-4exmacbrywjovsqp
Merged trunk, rsolved conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/schema_dictionary/tables.cc
100
100
                                             table_proto);
101
101
  }
102
102
 
103
 
  if (checkTableName())
104
 
    return false;
105
 
 
106
103
  return true;
107
104
}
108
105
 
116
113
 
117
114
    if (not nextSchema())
118
115
      return false;
 
116
 
119
117
    is_tables_primed= false;
120
118
  }
121
119
 
122
120
  return true;
123
121
}
124
122
 
125
 
bool TablesTool::Generator::checkTableName()
126
 
{
127
 
  if (isWild(table_name()))
128
 
    return true;
129
 
 
130
 
  if (not table_predicate.empty() && table_predicate.compare(table_name()))
131
 
    return true;
132
 
 
133
 
  return false;
134
 
}
135
 
 
136
123
bool TablesTool::Generator::populate()
137
124
{
138
125
  if (not nextTable())
270
257
  /* TABLE_COMMENT */
271
258
  push(table_proto.options().comment());
272
259
}
273
 
 
274
 
bool ShowTables::Generator::checkSchema()
275
 
{
276
 
  Session *session= current_session;
277
 
 
278
 
  if (session->lex->select_lex.db)
279
 
  {
280
 
    return schema_name().compare(session->lex->select_lex.db);
281
 
  }
282
 
  return session->db.compare(schema_name());
283
 
}