~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/handler.cc

Much closer toward UTF8 being around all the time...

Show diffs side-by-side

added added

removed removed

Lines of Context:
112
112
 
113
113
redo:
114
114
  /* my_strnncoll is a macro and gcc doesn't do early expansion of macro */
115
 
  if (thd && !my_charset_latin1.coll->strnncoll(&my_charset_latin1,
 
115
  if (thd && !my_charset_utf8_general_ci.coll->strnncoll(&my_charset_utf8_general_ci,
116
116
                           (const uchar *)name->str, name->length,
117
117
                           (const uchar *)STRING_WITH_LEN("DEFAULT"), 0))
118
118
    return ha_default_plugin(thd);
134
134
  */
135
135
  for (table_alias= sys_table_aliases; table_alias->str; table_alias+= 2)
136
136
  {
137
 
    if (!my_strnncoll(&my_charset_latin1,
 
137
    if (!my_strnncoll(&my_charset_utf8_general_ci,
138
138
                      (const uchar *)name->str, name->length,
139
139
                      (const uchar *)table_alias->str, table_alias->length))
140
140
    {