← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/identifier/schema.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/identifier/schema.cc
28
28
#include <drizzled/catalog/local.h>
29
29
#include <drizzled/util/tablename_to_filename.h>
30
30
#include <drizzled/util/backtrace.h>
 
31
#include <drizzled/charset_info.h>
31
32
 
32
33
#include <algorithm>
33
34
#include <sstream>
125
126
    }
126
127
 
127
128
    {
128
 
      const CHARSET_INFO * const cs= &my_charset_utf8mb4_general_ci;
 
129
      const charset_info_st * const cs= &my_charset_utf8mb4_general_ci;
129
130
 
130
131
      int well_formed_error;
131
132
      uint32_t res= cs->cset->well_formed_len(cs, db.c_str(), db.c_str() + db.length(),