← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_connect.cc

  • Committer: Brian Aker
  • Date: 2009-01-06 09:02:30 UTC
  • mfrom: (758.1.5 devel)
  • Revision ID: brian@tangent.org-20090106090230-ov94my79hsiz4bes
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_connect.cc
457
457
    {
458
458
      Security_context *sctx= &session->security_ctx;
459
459
 
460
 
      sql_print_warning(ER(ER_NEW_ABORTING_CONNECTION),
 
460
      errmsg_printf(ERRMSG_LVL_WARN, ER(ER_NEW_ABORTING_CONNECTION),
461
461
                        session->thread_id,(session->db ? session->db : "unconnected"),
462
462
                        sctx->user.empty() == false ? sctx->user.c_str() : "unauthenticated",
463
463
                        sctx->ip.c_str(),
499
499
    if (session->is_error())
500
500
    {
501
501
      session->killed= Session::KILL_CONNECTION;
502
 
      sql_print_warning(ER(ER_NEW_ABORTING_CONNECTION),
 
502
      errmsg_printf(ERRMSG_LVL_WARN, ER(ER_NEW_ABORTING_CONNECTION),
503
503
                        session->thread_id,(session->db ? session->db : "unconnected"),
504
504
                        sctx->user.empty() == false ? sctx->user.c_str() : "unauthenticated",
505
505
                        sctx->ip.c_str(), "init_connect command failed");
506
 
      sql_print_warning("%s", session->main_da.message());
 
506
      errmsg_printf(ERRMSG_LVL_WARN, "%s", session->main_da.message());
507
507
    }
508
508
    session->set_proc_info(0);
509
509
    session->set_time();