← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/show_dictionary/show_create_schema.cc

Merge with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/show_dictionary/show_create_schema.cc
37
37
 
38
38
ShowCreateSchema::Generator::Generator(Field **arg) :
39
39
  show_dictionary::Show::Generator(arg),
40
 
  is_primed(false),
41
40
  if_not_exists(false)
42
41
{
43
42
  if (not isShowQuery())
50
49
    schema_name.append(select->getShowTable());
51
50
    identifier::Schema identifier(select->getShowSchema());
52
51
 
53
 
    is_primed= plugin::StorageEngine::getSchemaDefinition(identifier,
54
 
                                                          schema_message);
 
52
    schema_message= plugin::StorageEngine::getSchemaDefinition(identifier);
55
53
 
56
54
    if_not_exists= select->getShowExists();
57
55
  }
59
57
 
60
58
bool ShowCreateSchema::Generator::populate()
61
59
{
62
 
  if (not is_primed)
 
60
  if (not schema_message)
63
61
    return false;
64
62
 
65
63
  std::string buffer;
84
82
 
85
83
  push(schema_message->name());
86
84
  push(buffer);
87
 
  is_primed= false;
 
85
 
 
86
  schema_message.reset();
88
87
 
89
88
  return true;
90
89
}