← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/time_functions.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/time_functions.cc
168
168
{
169
169
  char warn_buff[DRIZZLE_ERRMSG_SIZE];
170
170
  const char *type_str;
171
 
  CHARSET_INFO *cs= &my_charset_utf8_general_ci;
 
171
  charset_info_st *cs= &my_charset_utf8_general_ci;
172
172
  char buff[128];
173
173
  String str(buff,(uint32_t) sizeof(buff), system_charset_info);
174
174
  str.copy(str_val, str_length, system_charset_info);