← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Brian Aker
  • Date: 2010-02-14 02:02:48 UTC
  • mfrom: (1273.13.64 fix_is)
  • Revision ID: brian@gaz-20100214020248-bhovaejhz9fmer3q
Merge in data_dictionary.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
1186
1186
  if (default_collation_name)
1187
1187
  {
1188
1188
    const CHARSET_INFO * const default_collation= get_charset_by_name(default_collation_name);
1189
 
    if (!default_collation)
 
1189
    if (not default_collation)
1190
1190
    {
1191
 
          errmsg_printf(ERRMSG_LVL_ERROR, _(ER(ER_UNKNOWN_COLLATION)), default_collation_name);
 
1191
      errmsg_printf(ERRMSG_LVL_ERROR, _(ER(ER_UNKNOWN_COLLATION)), default_collation_name);
1192
1192
      return 1;
1193
1193
    }
1194
 
    if (!my_charset_same(default_charset_info, default_collation))
 
1194
    if (not my_charset_same(default_charset_info, default_collation))
1195
1195
    {
1196
 
          errmsg_printf(ERRMSG_LVL_ERROR, _(ER(ER_COLLATION_CHARSET_MISMATCH)),
1197
 
                      default_collation_name,
1198
 
                      default_charset_info->csname);
 
1196
      errmsg_printf(ERRMSG_LVL_ERROR, _(ER(ER_COLLATION_CHARSET_MISMATCH)),
 
1197
                    default_collation_name,
 
1198
                    default_charset_info->csname);
1199
1199
      return 1;
1200
1200
    }
1201
1201
    default_charset_info= default_collation;
1205
1205
 
1206
1206
  global_system_variables.optimizer_switch= 0;
1207
1207
 
1208
 
  if (!(character_set_filesystem=
 
1208
  if (not (character_set_filesystem=
1209
1209
        get_charset_by_csname(character_set_filesystem_name, MY_CS_PRIMARY)))
1210
1210
    return 1;
1211
1211
  global_system_variables.character_set_filesystem= character_set_filesystem;
1227
1227
 
1228
1228
static int init_thread_environment()
1229
1229
{
 
1230
   pthread_mutexattr_t attr; 
 
1231
   pthread_mutexattr_init(&attr);
 
1232
 
1230
1233
  (void) pthread_mutex_init(&LOCK_create_db, NULL);
1231
1234
  (void) pthread_mutex_init(&LOCK_open, NULL);
1232
 
  (void) pthread_mutex_init(&LOCK_thread_count,MY_MUTEX_INIT_FAST);
1233
 
  (void) pthread_mutex_init(&LOCK_status,MY_MUTEX_INIT_FAST);
1234
 
  (void) pthread_mutex_init(&LOCK_global_system_variables, MY_MUTEX_INIT_FAST);
 
1235
 
 
1236
  pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); 
 
1237
  (void) pthread_mutex_init(&LOCK_thread_count, &attr);
 
1238
  (void) pthread_mutex_init(&LOCK_global_system_variables, &attr);
 
1239
 
 
1240
  (void) pthread_mutex_init(&LOCK_status, MY_MUTEX_INIT_FAST);
1235
1241
  (void) pthread_rwlock_init(&LOCK_system_variables_hash, NULL);
1236
1242
  (void) pthread_mutex_init(&LOCK_global_read_lock, MY_MUTEX_INIT_FAST);
1237
1243
  (void) pthread_cond_init(&COND_thread_count,NULL);
1239
1245
  (void) pthread_cond_init(&COND_refresh,NULL);
1240
1246
  (void) pthread_cond_init(&COND_global_read_lock,NULL);
1241
1247
 
 
1248
  pthread_mutexattr_destroy(&attr);
 
1249
 
1242
1250
  if (pthread_key_create(&THR_Session,NULL) ||
1243
1251
      pthread_key_create(&THR_Mem_root,NULL))
1244
1252
  {