← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_function_container.cc

merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_function_container.cc
49
49
  {
50
50
    plugin::TableFunction *tool= (*it).second;
51
51
 
52
 
    if (predicate.length())
 
52
    if (tool->visable())
53
53
    {
54
 
      if (boost::iequals(predicate, tool->getSchemaHome()))
 
54
      if (predicate.length())
 
55
      {
 
56
        if (boost::iequals(predicate, tool->getSchemaHome()))
 
57
        {
 
58
          set_of_names.insert(tool->getTableLabel());
 
59
        }
 
60
      }
 
61
      else
55
62
      {
56
63
        set_of_names.insert(tool->getTableLabel());
57
64
      }
58
65
    }
59
 
    else
60
 
    {
61
 
      set_of_names.insert(tool->getTableLabel());
62
 
    }
63
66
  }
64
67
}
65
68
 
66
69
void TableFunctionContainer::addFunction(plugin::TableFunction *tool)
67
70
{
68
 
  std::pair<ToolMap::iterator, bool> ret;
69
 
 
70
 
  ret= table_map.insert(std::make_pair(tool->getPath(), tool));
 
71
  std::pair<ToolMap::iterator, bool> ret=
 
72
    table_map.insert(std::make_pair(tool->getPath(), tool));
71
73
  assert(ret.second == true);
72
74
}
73
75