~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/show_dictionary/show_indexes.cc

  • Committer: Brian Aker
  • Date: 2011-01-05 16:29:27 UTC
  • mto: (2060.2.1 clean)
  • mto: This revision was merged to the branch mainline in revision 2063.
  • Revision ID: brian@tangent.org-20110105162927-fi2gnmlz35qcagik
Add additional gperf for non-reserved SQL keywords.

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include <config.h>
22
 
#include <plugin/show_dictionary/dictionary.h>
23
 
#include <drizzled/identifier.h>
 
21
#include "config.h"
 
22
#include "plugin/show_dictionary/dictionary.h"
 
23
#include "drizzled/identifier.h"
24
24
 
25
25
 
26
26
using namespace std;
44
44
  index_iterator(0),
45
45
  index_part_iterator(0)
46
46
{
47
 
  if (not isShowQuery())
48
 
    return;
49
 
 
50
 
  statement::Show *select= static_cast<statement::Show *>(getSession().getLex()->statement);
 
47
  statement::Show *select= static_cast<statement::Show *>(getSession().lex->statement);
51
48
 
52
49
  if (not select->getShowTable().empty() && not select->getShowSchema().empty())
53
50
  {
54
51
    table_name.append(select->getShowTable().c_str());
55
 
    identifier::Table identifier(select->getShowSchema().c_str(), select->getShowTable().c_str());
56
 
 
57
 
    table_proto= plugin::StorageEngine::getTableMessage(getSession(), identifier);
58
 
 
59
 
    if (table_proto)
60
 
      is_tables_primed= true;
 
52
    TableIdentifier identifier(select->getShowSchema().c_str(), select->getShowTable().c_str());
 
53
 
 
54
    is_tables_primed= plugin::StorageEngine::getTableDefinition(getSession(),
 
55
                                                                identifier,
 
56
                                                                table_proto);
61
57
  }
62
58
}
63
59