← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Mark Atwood
  • Date: 2011-06-14 06:10:57 UTC
  • mfrom: (2318.2.19 rf)
  • Revision ID: me@mark.atwood.name-20110614061057-u08az4cidd4l7blm
merge lp:~olafvdspek/drizzle/refactor4

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
895
895
  return lex_str;
896
896
}
897
897
 
898
 
int Session::send_explain_fields(select_result *result)
 
898
void Session::send_explain_fields(select_result *result)
899
899
{
900
900
  List<Item> field_list;
901
901
  Item *item;
902
 
  const charset_info_st * const cs= system_charset_info;
 
902
  const charset_info_st* cs= system_charset_info;
903
903
  field_list.push_back(new Item_return_int("id",3, DRIZZLE_TYPE_LONGLONG));
904
904
  field_list.push_back(new Item_empty_string("select_type", 19, cs));
905
905
  field_list.push_back(item= new Item_empty_string("table", NAME_CHAR_LEN, cs));
906
906
  item->maybe_null= 1;
907
907
  field_list.push_back(item= new Item_empty_string("type", 10, cs));
908
908
  item->maybe_null= 1;
909
 
  field_list.push_back(item=new Item_empty_string("possible_keys",
910
 
                                                  NAME_CHAR_LEN*MAX_KEY, cs));
 
909
  field_list.push_back(item= new Item_empty_string("possible_keys", NAME_CHAR_LEN*MAX_KEY, cs));
911
910
  item->maybe_null=1;
912
 
  field_list.push_back(item=new Item_empty_string("key", NAME_CHAR_LEN, cs));
 
911
  field_list.push_back(item= new Item_empty_string("key", NAME_CHAR_LEN, cs));
913
912
  item->maybe_null=1;
914
913
  field_list.push_back(item=
915
914
    new Item_empty_string("key_len",
930
929
  }
931
930
  item->maybe_null= 1;
932
931
  field_list.push_back(new Item_empty_string("Extra", 255, cs));
933
 
  return (result->send_fields(field_list));
 
932
  result->send_fields(field_list);
934
933
}
935
934
 
936
935
void select_result::send_error(drizzled::error_t errcode, const char *err)