← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: Brian Aker
  • Date: 2009-11-30 19:13:19 UTC
  • mfrom: (1225.1.39 figure)
  • Revision ID: brian@gaz-20091130191319-zyt51fidacic3brf
Merge Padraig

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
174
174
  true  Error 
175
175
*/
176
176
 
177
 
bool list_open_tables(const char *db, const char *wild, bool(*func)(Table *table, open_table_list_st& open_list), Table *display)
 
177
bool list_open_tables(const char *db, 
 
178
                      const char *wild, 
 
179
                      bool(*func)(Table *table, 
 
180
                                  open_table_list_st& open_list,
 
181
                                  plugin::InfoSchemaTable *schema_table), 
 
182
                      Table *display,
 
183
                      plugin::InfoSchemaTable *schema_table)
178
184
{
179
185
  vector<open_table_list_st> open_list;
180
186
  vector<open_table_list_st>::iterator it;
225
231
 
226
232
  for (it= open_list.begin(); it < open_list.end(); it++)
227
233
  {
228
 
    if (func(display, *it))
 
234
    if (func(display, *it, schema_table))
229
235
      return true;
230
236
  }
231
237
 
2132
2138
    {
2133
2139
      continue;
2134
2140
    }
2135
 
    /*
2136
 
      If this TableList object is a placeholder for an information_schema
2137
 
      table, create a temporary table to represent the information_schema
2138
 
      table in the query. Do not fill it yet - will be filled during
2139
 
      execution.
2140
 
    */
2141
 
    if (tables->schema_table)
2142
 
    {
2143
 
      if (mysql_schema_table(this, lex, tables) == false)
2144
 
        continue;
2145
 
      return -1;
2146
 
    }
2147
2141
    (*counter)++;
2148
2142
 
2149
2143
    /*