← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.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:
drizzled/sql_parse.cc
83
83
*/
84
84
 
85
85
extern size_t my_thread_stack_size;
86
 
extern const CHARSET_INFO *character_set_filesystem;
 
86
extern const charset_info_st *character_set_filesystem;
87
87
 
88
88
namespace
89
89
{
853
853
                       Item *default_value, Item *on_update_value,
854
854
                       LEX_STRING *comment,
855
855
                       char *change,
856
 
                       List<String> *interval_list, const CHARSET_INFO * const cs)
 
856
                       List<String> *interval_list, const charset_info_st * const cs)
857
857
{
858
858
  register CreateField *new_field;
859
859
  LEX  *lex= &session->lex();
1637
1637
 
1638
1638
 
1639
1639
bool check_string_char_length(LEX_STRING *str, const char *err_msg,
1640
 
                              uint32_t max_char_length, const CHARSET_INFO * const cs,
 
1640
                              uint32_t max_char_length, const charset_info_st * const cs,
1641
1641
                              bool no_error)
1642
1642
{
1643
1643
  int well_formed_error;
1662
1662
    so they should be prohibited until such support is done.
1663
1663
    This is why we use the 3-byte utf8 to check well-formedness here.
1664
1664
  */
1665
 
  const CHARSET_INFO * const cs= &my_charset_utf8mb4_general_ci;
 
1665
  const charset_info_st * const cs= &my_charset_utf8mb4_general_ci;
1666
1666
 
1667
1667
  int well_formed_error;
1668
1668
  uint32_t res= cs->cset->well_formed_len(cs, str->str, str->str + str->length,