← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_function_container.cc

  • Committer: Monty Taylor
  • Date: 2010-10-13 17:53:36 UTC
  • mto: This revision was merged to the branch mainline in revision 1845.
  • Revision ID: mordred@inaugust.com-20101013175336-amzhjftgztblvua5
Updated pandora-build files to version 0.161

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