← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/show.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/show.cc
19
19
 
20
20
 
21
21
/* Function with list databases, tables or fields */
22
 
#include <drizzled/server_includes.h>
 
22
#include "config.h"
23
23
#include <drizzled/sql_select.h>
24
24
#include <drizzled/show.h>
25
25
#include <drizzled/gettext.h>
40
40
#include <drizzled/item/return_date_time.h>
41
41
#include <drizzled/item/empty_string.h>
42
42
#include "drizzled/plugin/registry.h"
 
43
#include "drizzled/session_list.h"
43
44
#include <drizzled/plugin/info_schema_table.h>
44
45
#include <drizzled/message/schema.pb.h>
45
46
#include <drizzled/plugin/client.h>
46
47
#include <mysys/cached_directory.h>
 
48
#include "drizzled/sql_table.h"
 
49
#include "drizzled/global_charset_info.h"
 
50
#include "drizzled/pthread_globals.h"
 
51
 
47
52
#include <sys/stat.h>
48
53
 
49
54
#include <string>
738
743
  if (!session->killed)
739
744
  {
740
745
    Session *tmp;
741
 
    for( vector<Session*>::iterator it= session_list.begin(); it != session_list.end(); ++it )
 
746
    for(vector<Session*>::iterator it= getSessionList().begin(); it != getSessionList().end(); ++it)
742
747
    {
743
748
      tmp= *it;
744
749
      Security_context *tmp_sctx= &tmp->security_ctx;
994
999
  *to= global_status_var;
995
1000
 
996
1001
  /* Add to this status from existing threads */
997
 
  for( vector<Session*>::iterator it= session_list.begin(); it != session_list.end(); ++it )
 
1002
  for(vector<Session*>::iterator it= getSessionList().begin(); it != getSessionList().end(); ++it )
998
1003
  {
999
1004
    add_to_status(to, &((*it)->status_var));
1000
1005
  }