← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/charset.cc

  • Committer: Patrick Crews
  • Date: 2010-12-07 20:02:50 UTC
  • Revision ID: gleebix@gmail.com-20101207200250-6a27jgqalgw5bsb5
Added disabled.def file to disable drizzleslap due to Bug#684269.  Need to skip for tarball release this round

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/charset.cc
22
22
#include <drizzled/configmake.h>
23
23
#include <vector>
24
24
 
25
 
#include "drizzled/visibility.h"
26
 
 
27
25
using namespace std;
28
26
 
29
27
namespace drizzled
58
56
       cs < all_charsets+array_elements(all_charsets)-1 ;
59
57
       cs++)
60
58
  {
61
 
    if ( cs[0] && cs[0]->name && !my_strcasecmp(&my_charset_utf8_general_ci, cs[0]->name, name))
62
 
    {
 
59
    if ( cs[0] && cs[0]->name &&
 
60
         !my_strcasecmp(&my_charset_utf8_general_ci, cs[0]->name, name))
63
61
      return cs[0]->number;
64
 
    }
65
62
  }
66
63
  return 0;
67
64
}
131
128
 
132
129
static bool charset_initialized= false;
133
130
 
134
 
DRIZZLED_API CHARSET_INFO *all_charsets[256];
135
 
const DRIZZLED_API CHARSET_INFO *default_charset_info = &my_charset_utf8_general_ci;
 
131
CHARSET_INFO *all_charsets[256];
 
132
const CHARSET_INFO *default_charset_info = &my_charset_utf8_general_ci;
136
133
 
137
134
void add_compiled_collation(CHARSET_INFO * cs)
138
135
{
216
213
       cs < all_charsets+array_elements(all_charsets)-1 ;
217
214
       cs++)
218
215
  {
219
 
    if ( cs[0] && cs[0]->csname && (cs[0]->state & cs_flags) && !my_strcasecmp(&my_charset_utf8_general_ci, cs[0]->csname, charset_name))
 
216
    if ( cs[0] && cs[0]->csname && (cs[0]->state & cs_flags) &&
 
217
         !my_strcasecmp(&my_charset_utf8_general_ci, cs[0]->csname, charset_name))
220
218
      return cs[0]->number;
221
219
  }
222
220
  return 0;