← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_ident.h

Merged Eric from lp:~eday/drizzle/eday-merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_ident.h
28
28
  LEX_STRING db;
29
29
  LEX_STRING table;
30
30
  Select_Lex_Unit *sel;
31
 
  inline Table_ident(Session *session, LEX_STRING db_arg, LEX_STRING table_arg,
32
 
                     bool force)
 
31
  inline Table_ident(LEX_STRING db_arg, LEX_STRING table_arg)
33
32
    :table(table_arg), sel((Select_Lex_Unit *)0)
34
33
  {
35
 
    if (!force && (session->client_capabilities & CLIENT_NO_SCHEMA))
36
 
      db.str=0;
37
 
    else
38
 
      db= db_arg;
 
34
    db= db_arg;
39
35
  }
40
36
  inline Table_ident(LEX_STRING table_arg)
41
37
    :table(table_arg), sel((Select_Lex_Unit *)0)