← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Andrew Hutchings
  • Date: 2011-03-29 20:45:43 UTC
  • mfrom: (2257 drizzle)
  • mto: (2257.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 2258.
  • Revision ID: andrew@linuxjedi.co.uk-20110329204543-ssex0nuo8knncgwx
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
943
943
{
944
944
  List<Item> field_list;
945
945
  Item *item;
946
 
  const CHARSET_INFO * const cs= system_charset_info;
 
946
  const charset_info_st * const cs= system_charset_info;
947
947
  field_list.push_back(new Item_return_int("id",3, DRIZZLE_TYPE_LONGLONG));
948
948
  field_list.push_back(new Item_empty_string("select_type", 19, cs));
949
949
  field_list.push_back(item= new Item_empty_string("table", NAME_CHAR_LEN, cs));
1258
1258
          escape_char != -1)
1259
1259
      {
1260
1260
        char *pos, *start, *end;
1261
 
        const CHARSET_INFO * const res_charset= res->charset();
1262
 
        const CHARSET_INFO * const character_set_client= default_charset_info;
 
1261
        const charset_info_st * const res_charset= res->charset();
 
1262
        const charset_info_st * const character_set_client= default_charset_info;
1263
1263
 
1264
1264
        bool check_second_byte= (res_charset == &my_charset_bin) &&
1265
1265
          character_set_client->