← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_list.cc

  • Committer: Lee Bieber
  • Date: 2011-03-03 19:19:28 UTC
  • mfrom: (2216.1.3 build)
  • Revision ID: kalebral@gmail.com-20110303191928-h2kris5kavbgmzu0
Merge Shrews - 728432: Remove write_bin_log() since it is no longer used.
Merge Andrew - 722988: wrong message for drizzled --verbose 
Merge Andrew - 728314: mysql socket file not created
Merge Stewart - 728288: enum_query_type is unused

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_list.cc
261
261
  return 0;
262
262
}
263
263
 
264
 
void TableList::print(Session *session, String *str, enum_query_type query_type)
 
264
void TableList::print(Session *session, String *str)
265
265
{
266
266
  if (nested_join)
267
267
  {
268
268
    str->append('(');
269
 
    print_join(session, str, &nested_join->join_list, query_type);
 
269
    print_join(session, str, &nested_join->join_list);
270
270
    str->append(')');
271
271
  }
272
272
  else
276
276
    {
277
277
      // A derived table
278
278
      str->append('(');
279
 
      derived->print(str, query_type);
 
279
      derived->print(str);
280
280
      str->append(')');
281
281
      cmp_name= "";                               // Force printing of alias
282
282
    }