← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/main.cc

  • Committer: Brian Aker
  • Date: 2011-02-08 02:06:04 UTC
  • mto: (2152.2.1 alter-table)
  • mto: This revision was merged to the branch mainline in revision 2154.
  • Revision ID: brian@tangent.org-20110208020604-p23mwd9yvamuwbwu
Merge in column varchar build.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/main.cc
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include <config.h>
 
20
#include "config.h"
21
21
 
22
22
#include <pthread.h>
23
23
#include <signal.h>
44
44
 
45
45
#include <boost/filesystem.hpp>
46
46
 
47
 
#include <drizzled/abort_exception.h>
48
 
#include <drizzled/catalog/local.h>
49
 
#include <drizzled/configmake.h>
50
 
#include <drizzled/data_home.h>
 
47
#include "drizzled/plugin.h"
 
48
#include "drizzled/gettext.h"
 
49
#include "drizzled/configmake.h"
 
50
#include "drizzled/session.h"
 
51
#include "drizzled/session/cache.h"
 
52
#include "drizzled/internal/my_sys.h"
 
53
#include "drizzled/unireg.h"
 
54
#include "drizzled/drizzled.h"
 
55
#include "drizzled/errmsg_print.h"
 
56
#include "drizzled/data_home.h"
 
57
#include "drizzled/plugin/listen.h"
 
58
#include "drizzled/plugin/client.h"
 
59
#include "drizzled/pthread_globals.h"
 
60
#include "drizzled/tztime.h"
 
61
#include "drizzled/signal_handler.h"
 
62
#include "drizzled/replication_services.h"
 
63
#include "drizzled/transaction_services.h"
 
64
#include "drizzled/catalog/local.h"
 
65
#include "drizzled/abort_exception.h"
 
66
 
51
67
#include <drizzled/debug.h>
52
 
#include <drizzled/drizzled.h>
53
 
#include <drizzled/errmsg_print.h>
54
 
#include <drizzled/gettext.h>
55
 
#include <drizzled/internal/my_sys.h>
56
 
#include <drizzled/plugin.h>
57
 
#include <drizzled/plugin/client.h>
58
 
#include <drizzled/plugin/listen.h>
59
 
#include <drizzled/plugin/monitored_in_transaction.h>
60
 
#include <drizzled/pthread_globals.h>
61
 
#include <drizzled/replication_services.h>
62
 
#include <drizzled/session.h>
63
 
#include <drizzled/session/cache.h>
64
 
#include <drizzled/signal_handler.h>
65
 
#include <drizzled/transaction_services.h>
66
 
#include <drizzled/tztime.h>
67
 
#include <drizzled/unireg.h>
68
 
#include <drizzled/util/backtrace.h>
69
 
#include <drizzled/current_session.h>
70
 
#include <drizzled/daemon.h>
 
68
 
 
69
#include "drizzled/util/backtrace.h"
71
70
 
72
71
using namespace drizzled;
73
72
using namespace std;
 
73
namespace fs=boost::filesystem;
74
74
 
75
75
static pthread_t select_thread;
76
76
static uint32_t thr_kill_signal;
77
77
 
78
 
extern bool opt_daemon;
79
 
 
80
78
 
81
79
/**
82
80
  All global error messages are sent here where the first one is stored
102
100
      return;
103
101
 
104
102
    /*
105
 
      session->getLex()->current_select == 0 if lex structure is not inited
 
103
      session->lex->current_select == 0 if lex structure is not inited
106
104
      (not query command (COM_QUERY))
107
105
    */
108
 
    if (! (session->getLex()->current_select &&
109
 
           session->getLex()->current_select->no_error && !session->is_fatal_error))
 
106
    if (! (session->lex->current_select &&
 
107
           session->lex->current_select->no_error && !session->is_fatal_error))
110
108
    {
111
109
      if (! session->main_da.is_error())            // Return only first message
112
110
      {
247
245
 
248
246
  /* Function generates error messages before abort */
249
247
  error_handler_hook= my_message_sql;
250
 
 
251
248
  /* init_common_variables must get basic settings such as data_home_dir
252
249
     and plugin_load_list. */
253
 
  if (init_basic_variables(argc, argv))
254
 
    unireg_abort(1);                            // Will do exit
255
 
 
256
 
  if (opt_daemon)
257
 
  {
258
 
    if (signal(SIGHUP, SIG_IGN) == SIG_ERR)
259
 
    {
260
 
      perror("Failed to ignore SIGHUP");
261
 
    }
262
 
    if (daemonize())
263
 
    {
264
 
      fprintf(stderr, "failed to daemon() in order to daemonize\n");
265
 
      exit(EXIT_FAILURE);
266
 
    }
267
 
  }
268
 
 
269
 
  if (init_remaining_variables(modules))
 
250
  if (init_common_variables(argc, argv, modules))
270
251
    unireg_abort(1);                            // Will do exit
271
252
 
272
253
  /*
300
281
      unireg_abort(1);
301
282
    }
302
283
 
303
 
    boost::filesystem::path &full_data_home= getFullDataHome();
304
 
    full_data_home= boost::filesystem::system_complete(getDataHome());
305
 
    errmsg_printf(error::INFO, "Data Home directory is : %s", full_data_home.native_file_string().c_str());
 
284
    fs::path &full_data_home= getFullDataHome();
 
285
    full_data_home= fs::system_complete(getDataHome());
 
286
    std::cerr << "home " << full_data_home << std::endl;
306
287
  }
307
288
 
308
289
 
347
328
    unireg_abort(1);
348
329
 
349
330
  assert(plugin::num_trx_monitored_objects > 0);
350
 
  if (drizzle_rm_tmp_tables())
 
331
  if (drizzle_rm_tmp_tables() || my_tz_init((Session *)0, default_tz_name))
351
332
  {
352
333
    abort_loop= true;
353
334
    select_thread_in_use=0;
380
361
    }
381
362
  }
382
363
 
383
 
  if (opt_daemon)
384
 
    daemon_is_ready();
385
364
 
386
365
  /* 
387
366
    Listen for new connections and start new session for each connection