← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_function_container.cc

  • Committer: lbieber
  • Date: 2010-10-06 16:34:16 UTC
  • mfrom: (1816.1.3 build)
  • Revision ID: lbieber@orisndriz08-20101006163416-ea0sl59qgpglk21y
Merge Monty - Change the requirement from either libinnodb to libhaildb. Also, tied it to version 2.2
Merge Andrew - fix bug 650935: remove --compress from all clients
Merge Andrew - fix bug 653471: Add -A to drizzle client
Merge Travis - 621861 = To change C structs to C++ classes in Drizzle

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_function_container.cc
1
1
/* - mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2010 Sun Microsystems, Inc.
 
4
 *  Copyright (C) 2010 Sun Microsystems
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
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