← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
14
14
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
15
15
 
16
16
#define DRIZZLE_LEX 1
17
 
#include <drizzled/server_includes.h>
 
17
#include "config.h"
18
18
#include <mysys/hash.h>
19
19
#include <drizzled/error.h>
20
20
#include <drizzled/nested_join.h>
37
37
#include <drizzled/statement.h>
38
38
#include <drizzled/statement/alter_table.h>
39
39
#include "drizzled/probes.h"
 
40
#include "drizzled/session_list.h"
 
41
#include "drizzled/global_charset_info.h"
 
42
 
40
43
 
41
44
#include "drizzled/plugin/logging.h"
42
45
#include "drizzled/plugin/info_schema_table.h"
43
46
#include "drizzled/optimizer/explain_plan.h"
 
47
#include "drizzled/pthread_globals.h"
44
48
 
45
49
#include <bitset>
46
50
#include <algorithm>
1492
1496
  uint32_t error=ER_NO_SUCH_THREAD;
1493
1497
  pthread_mutex_lock(&LOCK_thread_count); // For unlink from list
1494
1498
  
1495
 
  for( vector<Session*>::iterator it= session_list.begin(); it != session_list.end(); ++it )
 
1499
  for( vector<Session*>::iterator it= getSessionList().begin(); it != getSessionList().end(); ++it )
1496
1500
  {
1497
1501
    if ((*it)->thread_id == id)
1498
1502
    {