← Back to branch summary

~mordred/drizzle/codestyle

« back to all changes in this revision

Viewing changes to drizzled/sql_db.cc

  • Committer: Monty
  • Date: 2008-10-02 05:41:33 UTC
  • mfrom: (398.1.10 codestyle)
  • Revision ID: mordred@scylla.inaugust.com-20081002054133-tyxv5bmqpazfaqqi
Merged up to 408 of stdint-includes-fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_db.cc
556
556
    goto exit2;
557
557
  }
558
558
 
559
 
  VOID(pthread_mutex_lock(&LOCK_mysql_create_db));
 
559
  pthread_mutex_lock(&LOCK_mysql_create_db);
560
560
 
561
561
  /* Check directory */
562
562
  path_len= build_table_filename(path, sizeof(path), db, "", "", 0);
666
666
  }
667
667
 
668
668
exit:
669
 
  VOID(pthread_mutex_unlock(&LOCK_mysql_create_db));
 
669
  pthread_mutex_unlock(&LOCK_mysql_create_db);
670
670
  start_waiting_global_read_lock(thd);
671
671
exit2:
672
672
  return(error);
696
696
  if ((error=wait_if_global_read_lock(thd,0,1)))
697
697
    goto exit2;
698
698
 
699
 
  VOID(pthread_mutex_lock(&LOCK_mysql_create_db));
 
699
  pthread_mutex_lock(&LOCK_mysql_create_db);
700
700
 
701
701
  /* 
702
702
     Recreate db options file: /dbpath/.db.opt
741
741
  my_ok(thd, result);
742
742
 
743
743
exit:
744
 
  VOID(pthread_mutex_unlock(&LOCK_mysql_create_db));
 
744
  pthread_mutex_unlock(&LOCK_mysql_create_db);
745
745
  start_waiting_global_read_lock(thd);
746
746
exit2:
747
747
  return(error);
798
798
    goto exit2;
799
799
  }
800
800
 
801
 
  VOID(pthread_mutex_lock(&LOCK_mysql_create_db));
 
801
  pthread_mutex_lock(&LOCK_mysql_create_db);
802
802
 
803
803
  /*
804
804
    This statement will be replicated as a statement, even when using
924
924
  */
925
925
  if (thd->db && !strcmp(thd->db, db))
926
926
    mysql_change_db_impl(thd, NULL, thd->variables.collation_server);
927
 
  VOID(pthread_mutex_unlock(&LOCK_mysql_create_db));
 
927
  pthread_mutex_unlock(&LOCK_mysql_create_db);
928
928
  start_waiting_global_read_lock(thd);
929
929
exit2:
930
930
  return(error);
982
982
        goto err;
983
983
      table_list->db= (char*) (table_list+1);
984
984
      table_list->table_name= my_stpcpy(table_list->db, db) + 1;
985
 
      VOID(filename_to_tablename(file->name, table_list->table_name,
986
 
                                 MYSQL50_TABLE_NAME_PREFIX_LENGTH +
987
 
                                 strlen(file->name) + 1));
 
985
      filename_to_tablename(file->name, table_list->table_name,
 
986
                            MYSQL50_TABLE_NAME_PREFIX_LENGTH +
 
987
                            strlen(file->name) + 1);
988
988
      table_list->alias= table_list->table_name;        // If lower_case_table_names=2
989
989
      table_list->internal_tmp_table= is_prefix(file->name, tmp_file_prefix);
990
990
      /* Link into list */