← Back to branch summary

~ubuntu-branches/ubuntu/saucy/drizzle/saucy

« back to all changes in this revision

Viewing changes to drizzled/table_function_container.cc

  • Committer: Package Import Robot
  • Author(s): Clint Byrum
  • Date: 2012-06-19 10:46:49 UTC
  • mfrom: (1.2.11) (2.1.16 sid)
  • Revision ID: package-import@ubuntu.com-20120619104649-9ij634mxm4x8pp4l
Tags: 1:7.1.36-stable-1ubuntu1
https://launchpad.net/bugs/987575
* Merge from Debian unstable. (LP: #987575)
  Remaining changes:
  - Added upstart script.
* debian/drizzle.upstart: dropped logger since upstart logs job
  output now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_function_container.cc
30
30
 
31
31
plugin::TableFunction *TableFunctionContainer::getFunction(const std::string &path)
32
32
{
33
 
  ToolMap::mapped_type* ptr= find_ptr(table_map, path);
34
 
  return ptr ? *ptr : NULL;
 
33
  return find_ptr2(table_map, path);
35
34
}
36
35
 
37
36
void TableFunctionContainer::getNames(const string &predicate, std::set<std::string> &set_of_names)