← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzletest.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:
client/drizzletest.cc
68
68
 
69
69
/* Added this for string translation. */
70
70
#include <drizzled/gettext.h>
 
71
 
 
72
#include <drizzled/definitions.h>
 
73
#include <drizzled/charset_info.h>
 
74
#include <drizzled/internal/my_sys.h>
71
75
#include <drizzled/type/time.h>
72
76
#include <drizzled/charset.h>
73
77
#include <drizzled/typelib.h>
174
178
static boost::array<st_test_file, 16> file_stack;
175
179
static st_test_file* cur_file;
176
180
 
177
 
static const CHARSET_INFO *charset_info= &my_charset_utf8_general_ci; /* Default charset */
 
181
static const charset_info_st *charset_info= &my_charset_utf8_general_ci; /* Default charset */
178
182
 
179
183
/*
180
184
  Timer related variables
4123
4127
*/
4124
4128
 
4125
4129
 
4126
 
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,
4127
4131
                               const unsigned char *t, size_t tlen,
4128
4132
                               bool t_is_prefix)
4129
4133
{