← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/function_engine/function.cc

Merge in additional test case fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/function_engine/function.cc
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include <config.h>
 
21
#include "config.h"
22
22
 
23
23
#include <plugin/function_engine/function.h>
24
24
#include <plugin/function_engine/cursor.h>
39
39
 
40
40
{
41
41
  information_message->set_name(INFORMATION_SCHEMA_IDENTIFIER.getSchemaName());
42
 
  information_message->set_collation("utf8_general_ci");
43
 
  information_message->mutable_replication_options()->set_dont_replicate(true);
 
42
  data_dictionary_message->set_collation("utf8_general_ci");
44
43
 
45
44
  data_dictionary_message->set_name(DATA_DICTIONARY_IDENTIFIER.getSchemaName());
46
45
  data_dictionary_message->set_collation("utf8_general_ci");
47
 
  data_dictionary_message->mutable_replication_options()->set_dont_replicate(true);
48
46
}
49
47
 
50
48
 
75
73
  schemas.push_back(DATA_DICTIONARY_IDENTIFIER);
76
74
}
77
75
 
78
 
drizzled::message::schema::shared_ptr Function::doGetSchemaDefinition(const identifier::Schema &schema_identifier)
 
76
bool Function::doGetSchemaDefinition(const identifier::Schema &schema_identifier, message::schema::shared_ptr &schema_message)
79
77
{
80
 
  drizzled::message::schema::shared_ptr schema_message;
 
78
  schema_message.reset(new message::Schema); // This should be fixed, we could just be using ones we built on startup.
81
79
 
82
80
  if (schema_identifier == INFORMATION_SCHEMA_IDENTIFIER)
83
81
  {
89
87
  }
90
88
  else
91
89
  {
92
 
    return drizzled::message::schema::shared_ptr();
 
90
    return false;
93
91
  }
94
92
 
95
 
  return schema_message;
 
93
  return true;
96
94
}
97
95
 
98
96
bool Function::doCanCreateTable(const drizzled::identifier::Table &table_identifier)