← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/embedded_innodb/embedded_innodb_engine.cc

merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/embedded_innodb/embedded_innodb_engine.cc
167
167
  bool doDoesTableExist(Session&, const TableIdentifier &identifier);
168
168
 
169
169
private:
170
 
  void getTableNamesInSchemaFromInnoDB(drizzled::SchemaIdentifier &schema,
 
170
  void getTableNamesInSchemaFromInnoDB(const drizzled::SchemaIdentifier &schema,
171
171
                                       drizzled::plugin::TableNameList *set_of_names,
172
172
                                       drizzled::TableIdentifiers *identifiers);
173
173
 
174
174
public:
175
175
  void doGetTableNames(drizzled::CachedDirectory &,
176
 
                       drizzled::SchemaIdentifier &schema,
 
176
                       const drizzled::SchemaIdentifier &schema,
177
177
                       drizzled::plugin::TableNameList &set_of_names);
178
178
 
179
179
  void doGetTableIdentifiers(drizzled::CachedDirectory &,
180
 
                             drizzled::SchemaIdentifier &schema,
 
180
                             const drizzled::SchemaIdentifier &schema,
181
181
                             drizzled::TableIdentifiers &identifiers);
182
182
 
183
183
  /* The following defines can be increased if necessary */
1216
1216
}
1217
1217
 
1218
1218
void EmbeddedInnoDBEngine::getTableNamesInSchemaFromInnoDB(
1219
 
                                 drizzled::SchemaIdentifier &schema,
 
1219
                                 const drizzled::SchemaIdentifier &schema,
1220
1220
                                 drizzled::plugin::TableNameList *set_of_names,
1221
1221
                                 drizzled::TableIdentifiers *identifiers)
1222
1222
{
1287
1287
}
1288
1288
 
1289
1289
void EmbeddedInnoDBEngine::doGetTableNames(drizzled::CachedDirectory &,
1290
 
                                           drizzled::SchemaIdentifier &schema,
 
1290
                                           const drizzled::SchemaIdentifier &schema,
1291
1291
                                           drizzled::plugin::TableNameList &set_of_names)
1292
1292
{
1293
1293
  getTableNamesInSchemaFromInnoDB(schema, &set_of_names, NULL);
1294
1294
}
1295
1295
 
1296
1296
void EmbeddedInnoDBEngine::doGetTableIdentifiers(drizzled::CachedDirectory &,
1297
 
                                                 drizzled::SchemaIdentifier &schema,
 
1297
                                                 const drizzled::SchemaIdentifier &schema,
1298
1298
                                                 drizzled::TableIdentifiers &identifiers)
1299
1299
{
1300
1300
  getTableNamesInSchemaFromInnoDB(schema, NULL, &identifiers);
2892
2892
static DRIZZLE_SYSVAR_LONGLONG(log_file_size, innodb_log_file_size,
2893
2893
  PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
2894
2894
  "Size of each log file in a log group.",
2895
 
  NULL, NULL, 5*1024*1024L, 1*1024*1024L, INT64_MAX, 1024*1024L);
 
2895
  NULL, NULL, 20*1024*1024L, 1*1024*1024L, INT64_MAX, 1024*1024L);
2896
2896
 
2897
2897
static DRIZZLE_SYSVAR_LONGLONG(log_files_in_group, innodb_log_files_in_group,
2898
2898
  PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,