← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/show_dictionary/show_columns.cc

  • Committer: Monty Taylor
  • Date: 2011-02-13 17:26:39 UTC
  • mfrom: (2157.2.2 give-in-to-pkg-config)
  • mto: This revision was merged to the branch mainline in revision 2166.
  • Revision ID: mordred@inaugust.com-20110213172639-nhy7i72sfhoq13ms
Merged in pkg-config fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/show_dictionary/show_columns.cc
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
#include <string>
25
25
 
26
26
using namespace std;
60
60
  if (not isShowQuery())
61
61
   return;
62
62
 
63
 
  statement::Show *select= static_cast<statement::Show *>(getSession().getLex()->statement);
 
63
  statement::Show *select= static_cast<statement::Show *>(getSession().lex->statement);
64
64
 
65
65
  if (not select->getShowTable().empty() && not select->getShowSchema().empty())
66
66
  {
67
67
    table_name.append(select->getShowTable().c_str());
68
68
    identifier::Table identifier(select->getShowSchema().c_str(), select->getShowTable().c_str());
69
69
 
70
 
    table_proto= plugin::StorageEngine::getTableMessage(getSession(), identifier);
71
 
 
72
 
    if (table_proto)
73
 
      is_tables_primed= true;
 
70
    is_tables_primed= plugin::StorageEngine::getTableDefinition(getSession(),
 
71
                                                                identifier,
 
72
                                                                table_proto);
74
73
  }
75
74
}
76
75