← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

Merged in old drizzled-as-lib patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
46
46
#include "drizzled/db.h"
47
47
#include "drizzled/pthread_globals.h"
48
48
#include "drizzled/transaction_services.h"
 
49
#include "drizzled/drizzled.h"
49
50
 
50
51
#include "plugin/myisam/myisam.h"
51
52
#include "drizzled/internal/iocache.h"
74
75
const char * const Session::DEFAULT_WHERE= "field list";
75
76
extern pthread_key_t THR_Session;
76
77
extern pthread_key_t THR_Mem_root;
77
 
extern uint32_t max_used_connections;
78
 
extern atomic<uint32_t> connection_count;
79
78
 
80
79
 
81
80
/****************************************************************************
1048
1047
 
1049
1048
  if (!internal::dirname_length(exchange->file_name))
1050
1049
  {
1051
 
    strcpy(path, drizzle_real_data_home);
 
1050
    strcpy(path, data_home_real);
1052
1051
    if (! session->db.empty())
1053
 
      strncat(path, session->db.c_str(), FN_REFLEN-strlen(drizzle_real_data_home)-1);
 
1052
      strncat(path, session->db.c_str(), FN_REFLEN-strlen(data_home_real)-1);
1054
1053
    (void) internal::fn_format(path, exchange->file_name, path, "", option);
1055
1054
  }
1056
1055
  else
1057
 
    (void) internal::fn_format(path, exchange->file_name, drizzle_real_data_home, "", option);
 
1056
    (void) internal::fn_format(path, exchange->file_name, data_home_real, "", option);
1058
1057
 
1059
1058
  if (opt_secure_file_priv &&
1060
1059
      strncmp(opt_secure_file_priv, path, strlen(opt_secure_file_priv)))