← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/show.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/show.cc
21
21
/* Function with list databases, tables or fields */
22
22
#include <drizzled/server_includes.h>
23
23
#include <drizzled/sql_select.h>
24
 
#include <drizzled/sql_show.h>
 
24
#include <drizzled/show.h>
25
25
#include <mysys/my_dir.h>
26
26
#include <drizzled/gettext.h>
27
27
#include <drizzled/util/convert.h>
1015
1015
  uint32_t create_options = create_info ? create_info->options : 0;
1016
1016
 
1017
1017
  if (!my_strcasecmp(system_charset_info, dbname,
1018
 
                     INFORMATION_SCHEMA_NAME.str))
 
1018
                     INFORMATION_SCHEMA_NAME.c_str()))
1019
1019
  {
1020
 
    dbname= INFORMATION_SCHEMA_NAME.str;
 
1020
    dbname= INFORMATION_SCHEMA_NAME.c_str();
1021
1021
    create.default_table_charset= system_charset_info;
1022
1022
  }
1023
1023
  else
2028
2028
{
2029
2029
  LEX_STRING *i_s_name_copy= 0;
2030
2030
  i_s_name_copy= session->make_lex_string(i_s_name_copy,
2031
 
                                      INFORMATION_SCHEMA_NAME.str,
2032
 
                                      INFORMATION_SCHEMA_NAME.length, true);
 
2031
                                      INFORMATION_SCHEMA_NAME.c_str(),
 
2032
                                      INFORMATION_SCHEMA_NAME.length(), true);
2033
2033
  *with_i_schema= 0;
2034
2034
  if (lookup_field_vals->wild_db_value)
2035
2035
  {
2040
2040
    */
2041
2041
    if (!lookup_field_vals->db_value.str ||
2042
2042
        !wild_case_compare(system_charset_info, 
2043
 
                           INFORMATION_SCHEMA_NAME.str,
 
2043
                           INFORMATION_SCHEMA_NAME.c_str(),
2044
2044
                           lookup_field_vals->db_value.str))
2045
2045
    {
2046
2046
      *with_i_schema= 1;
2058
2058
  */
2059
2059
  if (lookup_field_vals->db_value.str)
2060
2060
  {
2061
 
    if (!my_strcasecmp(system_charset_info, INFORMATION_SCHEMA_NAME.str,
 
2061
    if (!my_strcasecmp(system_charset_info, INFORMATION_SCHEMA_NAME.c_str(),
2062
2062
                       lookup_field_vals->db_value.str))
2063
2063
    {
2064
2064
      *with_i_schema= 1;
4208
4208
     We have to make non const db_name & table_name
4209
4209
     because of lower_case_table_names
4210
4210
  */
4211
 
  session->make_lex_string(&db, INFORMATION_SCHEMA_NAME.str,
4212
 
                       INFORMATION_SCHEMA_NAME.length, 0);
 
4211
  session->make_lex_string(&db, INFORMATION_SCHEMA_NAME.c_str(),
 
4212
                       INFORMATION_SCHEMA_NAME.length(), 0);
4213
4213
  session->make_lex_string(&table, schema_table->table_name,
4214
4214
                       strlen(schema_table->table_name), 0);
4215
4215
  if (schema_table->old_format(session, schema_table) ||   /* Handle old syntax */