← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Monty Taylor
  • Date: 2008-10-29 21:21:57 UTC
  • mto: (520.4.26 devel)
  • mto: This revision was merged to the branch mainline in revision 570.
  • Revision ID: monty@inaugust.com-20081029212157-y3127au8tj1jxfal
Moved a bunch of crap out of common_includes.
Killed innodb_plugin_extras.h.
Made kittens happy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
437
437
 
438
438
/* Thread specific variables */
439
439
 
440
 
pthread_key(MEM_ROOT**,THR_MALLOC);
441
 
pthread_key(Session*, THR_Session);
 
440
pthread_key_t THR_MALLOC;
 
441
pthread_key_t THR_Session;
442
442
pthread_mutex_t LOCK_mysql_create_db, LOCK_open, LOCK_thread_count,
443
443
                LOCK_status, LOCK_global_read_lock,
444
444
                LOCK_error_log, LOCK_uuid_generator,
4774
4774
}
4775
4775
 
4776
4776
 
4777
 
/**
4778
 
  Fix filename and replace extension where 'dir' is relative to
4779
 
  mysql_real_data_home.
4780
 
  @return
4781
 
    1 if len(path) > FN_REFLEN
4782
 
*/
4783
 
 
4784
 
bool
4785
 
fn_format_relative_to_data_home(char * to, const char *name,
4786
 
                                const char *dir, const char *extension)
4787
 
{
4788
 
  char tmp_path[FN_REFLEN];
4789
 
  if (!test_if_hard_path(dir))
4790
 
  {
4791
 
    strcpy(tmp_path, mysql_real_data_home);
4792
 
    strncat(tmp_path, dir, sizeof(tmp_path)-strlen(mysql_real_data_home)-1);
4793
 
    dir=tmp_path;
4794
 
  }
4795
 
  return !fn_format(to, name, dir, extension,
4796
 
                    MY_APPEND_EXT | MY_UNPACK_FILENAME | MY_SAFE_PATH);
4797
 
}
4798
 
 
4799
 
 
4800
4777
static void fix_paths(void)
4801
4778
{
4802
4779
  char buff[FN_REFLEN],*pos;