← Back to branch summary

~ubuntu-branches/ubuntu/saucy/drizzle/saucy

« back to all changes in this revision

Viewing changes to drizzled/main.cc

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2011-03-02 10:38:38 UTC
  • mfrom: (1.2.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20110302103838-4ezi8b065c4bv329
Tags: 2011.03.11-0ubuntu1
* New upstream release.
* Sleep no longer an so.
* Re-add get-orig-source, but this time with working.
* New symbol added to libdrizzle.

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>
71
71
 
72
72
using namespace drizzled;
73
73
using namespace std;
74
 
namespace fs=boost::filesystem;
75
74
 
76
75
static pthread_t select_thread;
77
76
static uint32_t thr_kill_signal;
103
102
      return;
104
103
 
105
104
    /*
106
 
      session->lex->current_select == 0 if lex structure is not inited
 
105
      session->getLex()->current_select == 0 if lex structure is not inited
107
106
      (not query command (COM_QUERY))
108
107
    */
109
 
    if (! (session->lex->current_select &&
110
 
           session->lex->current_select->no_error && !session->is_fatal_error))
 
108
    if (! (session->getLex()->current_select &&
 
109
           session->getLex()->current_select->no_error && !session->is_fatal_error))
111
110
    {
112
111
      if (! session->main_da.is_error())            // Return only first message
113
112
      {
301
300
      unireg_abort(1);
302
301
    }
303
302
 
304
 
    fs::path &full_data_home= getFullDataHome();
305
 
    full_data_home= fs::system_complete(getDataHome());
306
 
    std::cerr << "home " << full_data_home << std::endl;
 
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());
307
306
  }
308
307
 
309
308
 
348
347
    unireg_abort(1);
349
348
 
350
349
  assert(plugin::num_trx_monitored_objects > 0);
351
 
  if (drizzle_rm_tmp_tables() || my_tz_init((Session *)0, default_tz_name))
 
350
  if (drizzle_rm_tmp_tables())
352
351
  {
353
352
    abort_loop= true;
354
353
    select_thread_in_use=0;