← 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: 2009-01-22 11:23:03 UTC
  • mto: This revision was merged to the branch mainline in revision 801.
  • Revision ID: brian@tangent.org-20090122112303-bjlveyqqperlj6ik
Removing include structures to old replication

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
26
26
#include <signal.h>
27
27
 
28
28
#include <mysys/my_bit.h>
29
 
#include <drizzled/replication/mi.h>
30
 
#include <drizzled/replication/replication.h>
31
29
#include <libdrizzle/libdrizzle.h>
32
30
#include <mysys/hash.h>
33
31
#include <drizzled/stacktrace.h>
599
597
  }
600
598
  (void) pthread_mutex_unlock(&LOCK_thread_count); // For unlink from list
601
599
 
602
 
  end_slave();
603
 
 
604
600
  if (thread_count)
605
601
    sleep(2);                                   // Give threads time to die
606
602
 
798
794
 
799
795
  drizzle_bin_log.cleanup();
800
796
 
801
 
  if (use_slave_mask)
802
 
    bitmap_free(&slave_error_mask);
803
797
  my_database_names_free();
804
798
  table_cache_free();
805
799
  table_def_free();
826
820
  free(sys_init_connect.value);
827
821
  free(sys_init_slave.value);
828
822
  free(drizzle_tmpdir);
829
 
  free(slave_load_tmpdir);
830
823
  if (opt_bin_logname)
831
824
    free(opt_bin_logname);
832
825
  if (opt_relay_logname)
1948
1941
  item_init();
1949
1942
  if (set_var_init())
1950
1943
    return 1;
1951
 
  if (init_replication_sys_vars())
1952
 
    return 1;
1953
1944
  /*
1954
1945
    Process a comma-separated character set list and choose
1955
1946
    the first available character set. This is mostly for
2108
2099
    unireg_abort(1);
2109
2100
  }
2110
2101
 
2111
 
  if (opt_log_slave_updates && replicate_same_server_id)
2112
 
  {
2113
 
      errmsg_printf(ERRMSG_LVL_ERROR, _("using --replicate-same-server-id in conjunction with "
2114
 
                      "--log-slave-updates is impossible, it would lead to "
2115
 
                      "infinite loops in this server."));
2116
 
    unireg_abort(1);
2117
 
  }
2118
 
 
2119
2102
  if (opt_bin_log)
2120
2103
  {
2121
2104
    char buf[FN_REFLEN];
2422
2405
    places) assume that active_mi != 0, so let's fail if it's 0 (out of
2423
2406
    memory); a message has already been printed.
2424
2407
  */
2425
 
  if (init_slave() && !active_mi)
2426
 
  {
2427
 
    unireg_abort(1);
2428
 
  }
2429
2408
 
2430
2409
  errmsg_printf(ERRMSG_LVL_INFO, _(ER(ER_STARTUP)),my_progname,server_version,
2431
2410
                        "", drizzled_port, COMPILATION_COMMENT);
3654
3633
    strncpy(language, argument, sizeof(language)-1);
3655
3634
    break;
3656
3635
  case OPT_SLAVE_SKIP_ERRORS:
3657
 
    init_slave_skip_errors(argument);
3658
3636
    break;
3659
3637
  case OPT_SLAVE_EXEC_MODE:
3660
3638
    break;
4015
3993
    }
4016
3994
  }
4017
3995
 
4018
 
  if (!slave_load_tmpdir)
4019
 
  {
4020
 
    if (!(slave_load_tmpdir = (char*) strdup(drizzle_tmpdir)))
4021
 
      exit(1);
4022
 
  }
4023
3996
  /*
4024
3997
    Convert the secure-file-priv option to system format, allowing
4025
3998
    a quick strcmp to check if read or write is in an allowed dir