~stewart/drizzle/use-catalog-for-path

« back to all changes in this revision

Viewing changes to client/drizzletest.cc

  • Committer: Brian Aker
  • Date: 2011-03-28 02:46:21 UTC
  • Revision ID: brian@tangent.org-20110328024621-wtkdtlvdplqm0ybf
Shift CHARSET_INFO to charset_info_st

Show diffs side-by-side

added added

removed removed

Lines of Context:
174
174
static boost::array<st_test_file, 16> file_stack;
175
175
static st_test_file* cur_file;
176
176
 
177
 
static const CHARSET_INFO *charset_info= &my_charset_utf8_general_ci; /* Default charset */
 
177
static const charset_info_st *charset_info= &my_charset_utf8_general_ci; /* Default charset */
178
178
 
179
179
/*
180
180
  Timer related variables
4127
4127
*/
4128
4128
 
4129
4129
 
4130
 
static int my_strnncoll_simple(const CHARSET_INFO * const  cs, const unsigned char *s, size_t slen,
 
4130
static int my_strnncoll_simple(const charset_info_st * const  cs, const unsigned char *s, size_t slen,
4131
4131
                               const unsigned char *t, size_t tlen,
4132
4132
                               bool t_is_prefix)
4133
4133
{