← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/storage_engine.cc

  • Committer: Brian Aker
  • Date: 2010-03-18 02:01:59 UTC
  • mfrom: (1354.1.2 build)
  • Revision ID: brian@gaz-20100318020159-e203gkiesd6odln7
Merge  for Brian

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/storage_engine.cc
310
310
  const char *db;
311
311
  const char *table_name;
312
312
  const bool is_tmp;
313
 
  message::Table *table_message;
 
313
  message::Table &table_message;
314
314
  int *err;
315
315
 
316
316
public:
319
319
                                  const char *db_arg,
320
320
                                  const char *table_name_arg,
321
321
                                  const bool is_tmp_arg,
322
 
                                  message::Table *table_message_arg,
 
322
                                  message::Table &table_message_arg,
323
323
                                  int *err_arg) :
324
324
    session(session_arg), 
325
325
    path(path_arg), 
352
352
                                           TableIdentifier &identifier,
353
353
                                           bool include_temporary_tables)
354
354
{
355
 
  return (plugin::StorageEngine::getTableDefinition(session, identifier, NULL, include_temporary_tables) == EEXIST);
 
355
  message::Table unused;
 
356
  return (plugin::StorageEngine::getTableDefinition(session, identifier, unused, include_temporary_tables) == EEXIST);
356
357
}
357
358
 
358
359
/**
362
363
*/
363
364
int StorageEngine::getTableDefinition(Session& session,
364
365
                                      TableIdentifier &identifier,
365
 
                                      message::Table *table_message,
 
366
                                      message::Table &table_message,
366
367
                                      bool include_temporary_tables)
367
368
{
368
369
  return getTableDefinition(session,
371
372
}
372
373
 
373
374
int StorageEngine::getTableDefinition(Session& session,
374
 
                                              const char* path,
375
 
                                              const char *schema_name,
376
 
                                              const char *table_name,
377
 
                                              const bool,
378
 
                                              message::Table *table_message,
379
 
                                              bool include_temporary_tables)
 
375
                                      const char* path,
 
376
                                      const char *schema_name,
 
377
                                      const char *table_name,
 
378
                                      const bool,
 
379
                                      message::Table &table_message,
 
380
                                      bool include_temporary_tables)
380
381
{
381
382
  int err= ENOENT;
382
383
 
469
470
 
470
471
  error_proto= StorageEngine::getTableDefinition(session,
471
472
                                                 identifier,
472
 
                                                 &src_proto);
 
473
                                                 src_proto);
473
474
 
474
475
  if (error_proto == ER_CORRUPT_TABLE_DEFINITION)
475
476
  {