← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/table_function.cc

  • Committer: Stewart Smith
  • Date: 2010-04-06 07:38:20 UTC
  • mfrom: (1283.28.40)
  • mto: (1283.38.1)
  • mto: This revision was merged to the branch mainline in revision 1536.
  • Revision ID: stewart@flamingspork.com-20100406073820-uf1mqht2jhn5zyl4
Merged embedded-innodb-position-rnd-pos into embedded-innodb-autoincrement.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/table_function.cc
144
144
}
145
145
 
146
146
plugin::TableFunction::Generator::Generator(Field **arg) :
147
 
  columns(arg)
 
147
  columns(arg),
 
148
  session(current_session)
148
149
{
149
150
  scs= system_charset_info;
150
151
}
220
221
 
221
222
bool plugin::TableFunction::Generator::isWild(const std::string &predicate)
222
223
{
223
 
  Session *session= current_session;
224
 
 
225
 
  if (not session->lex->wild)
 
224
  if (not getSession().lex->wild)
226
225
    return false;
227
226
 
228
227
  bool match= wild_case_compare(system_charset_info,
229
228
                                predicate.c_str(),
230
 
                                session->lex->wild->ptr());
 
229
                                getSession().lex->wild->ptr());
231
230
 
232
231
  return match;
233
232
}