← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Monty Taylor
  • Date: 2008-11-12 17:42:40 UTC
  • mto: This revision was merged to the branch mainline in revision 584.
  • Revision ID: monty@inaugust.com-20081112174240-l2vg9lnzbmjc3uyk
More header cleanup.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
25
25
#include <drizzled/query_id.h>
26
26
#include <drizzled/sql_parse.h>
27
27
#include <drizzled/data_home.h>
 
28
#include <drizzled/sql_base.h>
 
29
#include <drizzled/show.h>
 
30
#include <drizzled/rename.h>
28
31
 
29
32
/**
30
33
  @defgroup Runtime_Environment Runtime Environment
716
719
    packet= arg_end + 1;
717
720
 
718
721
    if (!my_strcasecmp(system_charset_info, table_list.db,
719
 
                       INFORMATION_SCHEMA_NAME.str))
 
722
                       INFORMATION_SCHEMA_NAME.c_str()))
720
723
    {
721
724
      ST_SCHEMA_TABLE *schema_table= find_schema_table(session, table_list.alias);
722
725
      if (schema_table)
3069
3072
  ptr->ignore_leaves= test(table_options & TL_OPTION_IGNORE_LEAVES);
3070
3073
  ptr->derived=     table->sel;
3071
3074
  if (!ptr->derived && !my_strcasecmp(system_charset_info, ptr->db,
3072
 
                                      INFORMATION_SCHEMA_NAME.str))
 
3075
                                      INFORMATION_SCHEMA_NAME.c_str()))
3073
3076
  {
3074
3077
    ST_SCHEMA_TABLE *schema_table= find_schema_table(session, ptr->table_name);
3075
3078
    if (!schema_table ||
3082
3085
          lex->sql_command == SQLCOM_SHOW_KEYS)))
3083
3086
    {
3084
3087
      my_error(ER_UNKNOWN_TABLE, MYF(0),
3085
 
               ptr->table_name, INFORMATION_SCHEMA_NAME.str);
 
3088
               ptr->table_name, INFORMATION_SCHEMA_NAME.c_str());
3086
3089
      return(0);
3087
3090
    }
3088
3091
    ptr->schema_table_name= ptr->table_name;
4087
4090
 
4088
4091
  if (create_table && (strcmp(create_table->db, "information_schema") == 0))
4089
4092
  {
4090
 
    my_error(ER_DBACCESS_DENIED_ERROR, MYF(0), "", "", INFORMATION_SCHEMA_NAME.str);
 
4093
    my_error(ER_DBACCESS_DENIED_ERROR, MYF(0), "", "", INFORMATION_SCHEMA_NAME.c_str());
4091
4094
    return(true);
4092
4095
  }
4093
4096
 
4164
4167
}
4165
4168
 
4166
4169
 
4167
 
bool check_identifier_name(LEX_STRING *str, uint32_t max_char_length,
4168
 
                           uint32_t err_code, const char *param_for_err_msg)
 
4170
bool check_identifier_name(LEX_STRING *str, uint32_t err_code,
 
4171
                           uint32_t max_char_length,
 
4172
                           const char *param_for_err_msg)
4169
4173
{
4170
4174
#ifdef HAVE_CHARSET_utf8mb3
4171
4175
  /*