← 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-11-11 01:17:35 UTC
  • mto: This revision was merged to the branch mainline in revision 584.
  • Revision ID: monty@inaugust.com-20081111011735-ct447w151fbbubcu
Removed my_getwd.
Moved replication files.
Moved more stuff out of server_includes.h.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
27
27
 
28
28
#include <mysys/my_bit.h>
29
29
#include <drizzled/slave.h>
30
 
#include <drizzled/rpl_mi.h>
31
 
#include <drizzled/sql_repl.h>
32
 
#include <drizzled/rpl_filter.h>
 
30
#include <drizzled/replication/mi.h>
 
31
#include <drizzled/replication/replication.h>
 
32
#include <drizzled/replication/filter.h>
33
33
#include <drizzled/stacktrace.h>
34
34
#include <mysys/mysys_err.h>
35
35
#include <drizzled/error.h>
125
125
#include <sys/fpu.h>
126
126
#endif
127
127
 
 
128
 
128
129
inline void setup_fpu()
129
130
{
130
131
#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H)
168
169
 
169
170
extern "C" RETSIGTYPE handle_segfault(int sig);
170
171
 
 
172
using namespace std;
 
173
 
171
174
/* Constants */
172
175
 
173
176
const char *show_comp_option_name[]= {"YES", "NO", "DISABLED"};
1069
1072
/** Change root user if started with @c --chroot . */
1070
1073
static void set_root(const char *path)
1071
1074
{
1072
 
  if (chroot(path) == -1)
 
1075
  if ((chroot(path) == -1) || !chdir("/"))
1073
1076
  {
1074
1077
    sql_perror("chroot");
1075
1078
    unireg_abort(1);
1076
1079
  }
1077
 
  my_setwd("/", MYF(0));
1078
1080
}
1079
1081
 
1080
1082
 
2491
2493
    We have enough space for fiddling with the argv, continue
2492
2494
  */
2493
2495
  check_data_home(drizzle_real_data_home);
2494
 
  if (my_setwd(drizzle_real_data_home,MYF(MY_WME)) && !opt_help)
 
2496
  if (chdir(drizzle_real_data_home) && !opt_help)
2495
2497
    unireg_abort(1);                            /* purecov: inspected */
2496
2498
  drizzle_data_home= drizzle_data_home_buff;
2497
2499
  drizzle_data_home[0]=FN_CURLIB;               // all paths are relative from here