← 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: 2009-10-02 19:38:12 UTC
  • mfrom: (1152.1.7 merge)
  • Revision ID: brian@gaz-20091002193812-mpd61oecep74t6gd
Merge Monty + Brian for plugins.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
16
16
#define DRIZZLE_LEX 1
17
17
#include <drizzled/server_includes.h>
18
18
#include <mysys/hash.h>
19
 
#include <drizzled/logging.h>
20
19
#include <drizzled/db.h>
21
20
#include <drizzled/error.h>
22
21
#include <drizzled/nested_join.h>
25
24
#include <drizzled/data_home.h>
26
25
#include <drizzled/sql_base.h>
27
26
#include <drizzled/show.h>
28
 
#include <drizzled/info_schema.h>
 
27
#include <drizzled/plugin/info_schema_table.h>
29
28
#include <drizzled/function/time/unix_timestamp.h>
30
29
#include <drizzled/function/get_system_var.h>
31
30
#include <drizzled/item/cmpfunc.h>
39
38
#include <drizzled/statement/alter_table.h>
40
39
#include "drizzled/probes.h"
41
40
 
 
41
#include "drizzled/plugin/logging.h"
 
42
#include "drizzled/plugin/info_schema_table.h"
 
43
 
42
44
#include <bitset>
43
45
#include <algorithm>
44
46
 
 
47
using namespace drizzled;
45
48
using namespace std;
46
49
 
47
50
/* Prototypes */
189
192
 
190
193
  /* TODO: set session->lex->sql_command to SQLCOM_END here */
191
194
 
192
 
  logging_pre_do(session);
 
195
  plugin::Logging::preDo(session);
193
196
 
194
197
  session->server_status&=
195
198
           ~(SERVER_QUERY_NO_INDEX_USED | SERVER_QUERY_NO_GOOD_INDEX_USED);
299
302
  /* Free tables */
300
303
  session->close_thread_tables();
301
304
 
302
 
  logging_post_do(session);
 
305
  plugin::Logging::postDo(session);
303
306
 
304
307
  /* Store temp state for processlist */
305
308
  session->set_proc_info("cleaning up");
991
994
  if (!ptr->derived && !my_strcasecmp(system_charset_info, ptr->db,
992
995
                                      INFORMATION_SCHEMA_NAME.c_str()))
993
996
  {
994
 
    InfoSchemaTable *schema_table= find_schema_table(ptr->table_name);
 
997
    plugin::InfoSchemaTable *schema_table= plugin::InfoSchemaTable::getTable(ptr->table_name);
995
998
    if (!schema_table ||
996
999
        (schema_table->isHidden() &&
997
1000
         ((sql_command_flags[lex->sql_command].test(CF_BIT_STATUS_COMMAND)) == 0 ||