← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/transaction_log/transaction_log.cc

  • Committer: Brian Aker
  • Date: 2010-02-14 02:02:48 UTC
  • mfrom: (1273.13.64 fix_is)
  • Revision ID: brian@gaz-20100214020248-bhovaejhz9fmer3q
Merge in data_dictionary.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/transaction_log/transaction_log.cc
73
73
#include "config.h"
74
74
#include "transaction_log.h"
75
75
#include "transaction_log_index.h"
76
 
#include "info_schema.h"
 
76
#include "data_dictionary_schema.h"
77
77
#include "print_transaction_message.h"
78
78
#include "hexdump_transaction_message.h"
79
79
#include "background_worker.h"
127
127
 */
128
128
static uint32_t sysvar_transaction_log_sync_method= 0;
129
129
 
130
 
/** Views defined in info_schema.cc */
131
 
extern plugin::InfoSchemaTable *transaction_log_view;
132
 
extern plugin::InfoSchemaTable *transaction_log_entries_view;
133
 
extern plugin::InfoSchemaTable *transaction_log_transactions_view;
 
130
/** DATA_DICTIONARY views */
 
131
static TransactionLogTool *transaction_log_tool;
 
132
static TransactionLogEntriesTool *transaction_log_entries_tool;
 
133
static TransactionLogTransactionsTool *transaction_log_transactions_tool;
134
134
 
135
135
/** Index defined in transaction_log_index.cc */
136
136
extern TransactionLogIndex *transaction_log_index;
430
430
    }
431
431
    registry.add(transaction_log);
432
432
 
433
 
    /* Setup the INFORMATION_SCHEMA views for the transaction log */
434
 
    if (initViewMethods() ||
435
 
        initViewColumns() || 
436
 
        initViews())
437
 
      return 1; /* Error message output handled in functions above */
 
433
    /* Setup DATA_DICTIONARY views */
438
434
 
439
 
    registry.add(transaction_log_view);
440
 
    registry.add(transaction_log_entries_view);
441
 
    registry.add(transaction_log_transactions_view);
 
435
    transaction_log_tool= new(std::nothrow)TransactionLogTool;
 
436
    registry.add(transaction_log_tool);
 
437
    transaction_log_entries_tool= new(std::nothrow)TransactionLogEntriesTool;
 
438
    registry.add(transaction_log_entries_tool);
 
439
    transaction_log_transactions_tool= new(std::nothrow)TransactionLogTransactionsTool;
 
440
    registry.add(transaction_log_transactions_tool);
442
441
 
443
442
    /* Setup the module's UDFs */
444
443
    print_transaction_message_func_factory=
487
486
    delete transaction_log;
488
487
    delete transaction_log_index;
489
488
 
490
 
    /* Cleanup the INFORMATION_SCHEMA views */
491
 
    registry.remove(transaction_log_view);
492
 
    registry.remove(transaction_log_entries_view);
493
 
    registry.remove(transaction_log_transactions_view);
494
 
 
495
 
    cleanupViewMethods();
496
 
    cleanupViewColumns();
497
 
    cleanupViews();
 
489
    /* Cleanup the DATA_DICTIONARY views */
 
490
    registry.remove(transaction_log_tool);
 
491
    delete transaction_log_tool;
 
492
    registry.remove(transaction_log_entries_tool);
 
493
    delete transaction_log_entries_tool;
 
494
    registry.remove(transaction_log_transactions_tool);
 
495
    delete transaction_log_transactions_tool;
498
496
 
499
497
    /* Cleanup module UDFs */
500
498
    registry.remove(print_transaction_message_func_factory);