← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/show.cc

I_S now provides its own tables via the SE interface

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/show.cc
136
136
  {
137
137
    my_errno= directory.getError();
138
138
    my_error(ER_CANT_READ_DIR, MYF(0), path, my_errno);
139
 
    return(true);
 
139
 
 
140
    return true;
140
141
  }
141
142
 
142
143
  CachedDirectory::Entries entries= directory.getEntries();
1468
1469
  set<string> set_of_names;
1469
1470
 
1470
1471
  build_table_filename(path, sizeof(path), db_name->str, "", false);
 
1472
 
1471
1473
  if (!lookup_field_vals->wild_table_value &&
1472
1474
      lookup_field_vals->table_value.str)
1473
1475
  {
1485
1487
    return 0;
1486
1488
  }
1487
1489
 
1488
 
  /*
1489
 
    This call will add all matching the wildcards (if specified) IS tables
1490
 
    to the list
1491
 
  */
1492
 
  if (with_i_schema)
1493
 
    return plugin::InfoSchemaTable::addTableToList(session, table_names,
1494
 
                                      lookup_field_vals->table_value.str);
1495
 
 
1496
1490
  string db(db_name->str);
1497
 
 
1498
1491
  plugin::StorageEngine::getTableNames(db, set_of_names);
1499
1492
 
1500
1493
  /*  
1515
1508
    const char* wild= lookup_field_vals->table_value.str;
1516
1509
    if (wild && wild_compare((*it).c_str(), wild, 0))
1517
1510
      continue;
 
1511
 
1518
1512
    table_names.push_back(file_name);
1519
1513
  }
1520
1514