← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Brian Aker
  • Date: 2008-10-08 02:28:58 UTC
  • mfrom: (489.1.13 codestyle)
  • Revision ID: brian@tangent.org-20081008022858-ea8esagkxmn0dupc
Merge of Monty's work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
222
222
  Vio* save_vio;
223
223
  ulong save_client_capabilities;
224
224
 
225
 
  thd_proc_info(thd, "Execution of init_command");
 
225
  thd->set_proc_info("Execution of init_command");
226
226
  /*
227
227
    We need to lock init_command_var because
228
228
    during execution of init_command_var query
856
856
 
857
857
  log_slow_statement(thd);
858
858
 
859
 
  thd_proc_info(thd, "cleaning up");
 
859
  thd->set_proc_info("cleaning up");
860
860
  pthread_mutex_lock(&LOCK_thread_count); // For process list
861
 
  thd_proc_info(thd, 0);
 
861
  thd->set_proc_info(0);
862
862
  thd->command=COM_SLEEP;
863
863
  thd->query=0;
864
864
  thd->query_length=0;
1893
1893
    if (add_item_to_list(thd, new Item_null()))
1894
1894
      goto error;
1895
1895
 
1896
 
    thd_proc_info(thd, "init");
 
1896
    thd->set_proc_info("init");
1897
1897
    if ((res= open_and_lock_tables(thd, all_tables)))
1898
1898
      break;
1899
1899
 
2396
2396
    my_ok(thd);
2397
2397
    break;
2398
2398
  }
2399
 
  thd_proc_info(thd, "query end");
 
2399
  thd->set_proc_info("query end");
2400
2400
 
2401
2401
  /*
2402
2402
    Binlog-related cleanup:
2825
2825
      assert(thd->is_error());
2826
2826
    }
2827
2827
    lex->unit.cleanup();
2828
 
    thd_proc_info(thd, "freeing items");
 
2828
    thd->set_proc_info("freeing items");
2829
2829
    thd->end_statement();
2830
2830
    thd->cleanup_after_query();
2831
2831
    assert(thd->change_list.is_empty());