← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/function_engine/function.cc

  • Committer: Brian Aker
  • Date: 2010-10-15 00:59:36 UTC
  • mfrom: (1849 staging)
  • mto: This revision was merged to the branch mainline in revision 1853.
  • Revision ID: brian@tangent.org-20101015005936-znhvkz8khs4fhlyv
Merge with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/function_engine/function.cc
36
36
                                  HTON_ALTER_NOT_SUPPORTED |
37
37
                                  HTON_HAS_SCHEMA_DICTIONARY |
38
38
                                  HTON_SKIP_STORE_LOCK |
39
 
                                  HTON_TEMPORARY_NOT_SUPPORTED)
 
39
                                  HTON_TEMPORARY_NOT_SUPPORTED),
 
40
  information_message(new(message::Schema)),
 
41
  data_dictionary_message(new(message::Schema))
 
42
 
40
43
{
 
44
  information_message->set_name("information_schema");
 
45
  data_dictionary_message->set_collation("utf8_general_ci");
 
46
 
 
47
  data_dictionary_message->set_name("data_dictionary");
 
48
  data_dictionary_message->set_collation("utf8_general_ci");
41
49
}
42
50
 
43
51
 
68
76
  schemas.push_back(DATA_DICTIONARY_IDENTIFIER);
69
77
}
70
78
 
71
 
bool Function::doGetSchemaDefinition(const SchemaIdentifier &schema_identifier, message::Schema &schema_message)
 
79
bool Function::doGetSchemaDefinition(const SchemaIdentifier &schema_identifier, message::SchemaPtr &schema_message)
72
80
{
 
81
  schema_message.reset(new message::Schema); // This should be fixed, we could just be using ones we built on startup.
 
82
 
73
83
  if (schema_identifier == INFORMATION_SCHEMA_IDENTIFIER)
74
84
  {
75
 
    schema_message.set_name("information_schema");
76
 
    schema_message.set_collation("utf8_general_ci");
 
85
    schema_message= information_message;
77
86
  }
78
87
  else if (schema_identifier == DATA_DICTIONARY_IDENTIFIER)
79
88
  {
80
 
    schema_message.set_name("data_dictionary");
81
 
    schema_message.set_collation("utf8_general_ci");
 
89
    schema_message= data_dictionary_message;
82
90
  }
83
91
  else
84
92
  {