← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/transaction_log/info_schema.cc

Merged up with staging.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/transaction_log/info_schema.cc
90
90
/*
91
91
 * Vectors of columns for I_S tables.
92
92
 */
93
 
static vector<const plugin::ColumnInfo *> transaction_log_view_columns;
94
 
static vector<const plugin::ColumnInfo *> transaction_log_entries_view_columns;
95
 
static vector<const plugin::ColumnInfo *> transaction_log_transactions_view_columns;
 
93
static vector<const plugin::ColumnInfo *> *transaction_log_view_columns= NULL;
 
94
static vector<const plugin::ColumnInfo *> *transaction_log_entries_view_columns= NULL;
 
95
static vector<const plugin::ColumnInfo *> *transaction_log_transactions_view_columns= NULL;
96
96
 
97
97
/*
98
98
 * Methods for I_S tables.
537
537
 
538
538
bool initViewColumns()
539
539
{
540
 
  if (createTransactionLogViewColumns(transaction_log_view_columns))
541
 
  {
542
 
    return true;
543
 
  }
544
 
 
545
 
  if (createTransactionLogEntriesViewColumns(transaction_log_entries_view_columns))
546
 
  {
547
 
    return true;
548
 
  }
549
 
 
550
 
  if (createTransactionLogTransactionsViewColumns(transaction_log_transactions_view_columns))
 
540
  transaction_log_view_columns= new (nothrow) vector<const plugin::ColumnInfo *>;
 
541
  if (transaction_log_view_columns == NULL)
 
542
  {
 
543
    return true;
 
544
  }
 
545
  transaction_log_entries_view_columns= new (nothrow) vector<const plugin::ColumnInfo *>;
 
546
  if (transaction_log_entries_view_columns == NULL)
 
547
  {
 
548
    return true;
 
549
  }
 
550
  transaction_log_transactions_view_columns= new (nothrow) vector<const plugin::ColumnInfo *>;
 
551
  if (transaction_log_transactions_view_columns == NULL)
 
552
  {
 
553
    return true;
 
554
  }
 
555
 
 
556
  if (createTransactionLogViewColumns(*transaction_log_view_columns))
 
557
  {
 
558
    return true;
 
559
  }
 
560
 
 
561
  if (createTransactionLogEntriesViewColumns(*transaction_log_entries_view_columns))
 
562
  {
 
563
    return true;
 
564
  }
 
565
 
 
566
  if (createTransactionLogTransactionsViewColumns(*transaction_log_transactions_view_columns))
551
567
  {
552
568
    return true;
553
569
  }
563
579
 
564
580
void cleanupViewColumns()
565
581
{
566
 
  clearViewColumns(transaction_log_view_columns);
567
 
  clearViewColumns(transaction_log_entries_view_columns);
568
 
  clearViewColumns(transaction_log_transactions_view_columns);
 
582
  clearViewColumns(*transaction_log_view_columns);
 
583
  delete transaction_log_view_columns;
 
584
  clearViewColumns(*transaction_log_entries_view_columns);
 
585
  delete transaction_log_entries_view_columns;
 
586
  clearViewColumns(*transaction_log_transactions_view_columns);
 
587
  delete transaction_log_transactions_view_columns;
569
588
}
570
589
 
571
590
bool initViewMethods()
608
627
{
609
628
  transaction_log_view= 
610
629
    new (nothrow) plugin::InfoSchemaTable("TRANSACTION_LOG",
611
 
                                          transaction_log_view_columns,
 
630
                                          *transaction_log_view_columns,
612
631
                                          -1, -1, false, false, 0,
613
632
                                          transaction_log_view_methods);
614
633
  if (transaction_log_view == NULL)
621
640
 
622
641
  transaction_log_entries_view= 
623
642
    new (nothrow) plugin::InfoSchemaTable("TRANSACTION_LOG_ENTRIES",
624
 
                                          transaction_log_entries_view_columns,
 
643
                                          *transaction_log_entries_view_columns,
625
644
                                          -1, -1, false, false, 0,
626
645
                                          transaction_log_entries_view_methods);
627
646
  if (transaction_log_entries_view == NULL)
634
653
 
635
654
  transaction_log_transactions_view= 
636
655
    new (nothrow) plugin::InfoSchemaTable("TRANSACTION_LOG_TRANSACTIONS",
637
 
                                          transaction_log_transactions_view_columns,
 
656
                                          *transaction_log_transactions_view_columns,
638
657
                                          -1, -1, false, false, 0,
639
658
                                          transaction_log_transactions_view_methods);
640
659
  if (transaction_log_transactions_view == NULL)