← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_show.cc

  • Committer: Grant Limberg
  • Date: 2008-08-12 21:13:01 UTC
  • mto: (322.1.1 codestyle)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: grant@glsoftware.net-20080812211301-ym3wsowelkgp16s2
renamed all instances of MYSQL_ to DRIZZLE_

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_show.cc
171
171
{
172
172
  TABLE *table= tables->table;
173
173
 
174
 
  if (plugin_foreach_with_mask(thd, show_plugins, MYSQL_ANY_PLUGIN,
 
174
  if (plugin_foreach_with_mask(thd, show_plugins, DRIZZLE_ANY_PLUGIN,
175
175
                               ~PLUGIN_IS_FREED, table))
176
176
    return(1);
177
177
 
749
749
      if (column_format)
750
750
      {
751
751
        packet->append(STRING_WITH_LEN(" /*!"));
752
 
        packet->append(STRING_WITH_LEN(MYSQL_VERSION_TABLESPACE_IN_FRM_STR));
 
752
        packet->append(STRING_WITH_LEN(DRIZZLE_VERSION_TABLESPACE_IN_FRM_STR));
753
753
        packet->append(STRING_WITH_LEN(" COLUMN_FORMAT"));
754
754
        if (column_format == COLUMN_FORMAT_TYPE_FIXED)
755
755
          packet->append(STRING_WITH_LEN(" FIXED */"));
2155
2155
  add_data.files= files;
2156
2156
  add_data.wild= wild;
2157
2157
  if (plugin_foreach(thd, add_schema_table,
2158
 
                     MYSQL_INFORMATION_SCHEMA_PLUGIN, &add_data))
 
2158
                     DRIZZLE_INFORMATION_SCHEMA_PLUGIN, &add_data))
2159
2159
    return(1);
2160
2160
 
2161
2161
  return(0);
2284
2284
  */
2285
2285
  lex->sql_command= SQLCOM_SHOW_FIELDS;
2286
2286
  res= open_normal_and_derived_tables(thd, show_table_list,
2287
 
                                      MYSQL_LOCK_IGNORE_FLUSH);
 
2287
                                      DRIZZLE_LOCK_IGNORE_FLUSH);
2288
2288
  lex->sql_command= save_sql_command;
2289
2289
  /*
2290
2290
    get_all_tables() returns 1 on failure and 0 on success thus
2655
2655
            show_table_list->i_s_requested_object=
2656
2656
              schema_table->i_s_requested_object;
2657
2657
            res= open_normal_and_derived_tables(thd, show_table_list,
2658
 
                                                MYSQL_LOCK_IGNORE_FLUSH);
 
2658
                                                DRIZZLE_LOCK_IGNORE_FLUSH);
2659
2659
            lex->sql_command= save_sql_command;
2660
2660
            /*
2661
2661
              XXX:  show_table_list has a flag i_is_requested,
3824
3824
 
3825
3825
  schema_table_a.table_name= table_name;
3826
3826
  if (plugin_foreach(thd, find_schema_table_in_plugin, 
3827
 
                     MYSQL_INFORMATION_SCHEMA_PLUGIN, &schema_table_a))
 
3827
                     DRIZZLE_INFORMATION_SCHEMA_PLUGIN, &schema_table_a))
3828
3828
    return(schema_table_a.schema_table);
3829
3829
 
3830
3830
  return(NULL);