← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/handler/i_s.cc

  • Committer: Padraig O'Sullivan
  • Date: 2009-11-26 04:33:51 UTC
  • mto: (1228.4.1 push)
  • mto: This revision was merged to the branch mainline in revision 1234.
  • Revision ID: osullivan.padraig@gmail.com-20091126043351-2ebmuyzrbifxat0q
Removed all remnants of schema_table from the TableList class. This cleans up a bunch of code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/i_s.cc
274
274
fill_innodb_trx_from_cache(
275
275
/*=======================*/
276
276
        trx_i_s_cache_t*        cache,  /*!< in: cache to read from */
277
 
        Table*                  table)  /*!< in/out: fill this table */
 
277
        Table*                  table,  /*!< in/out: fill this table */
 
278
        drizzled::plugin::InfoSchemaTable *schema_table)
278
279
{
279
280
        Field** fields;
280
281
        ulint   rows_num;
340
341
                OK(field_store_string(fields[IDX_TRX_QUERY],
341
342
                                      row->trx_query));
342
343
 
343
 
                TableList *tmp_tbl_list= table->pos_in_table_list;
344
 
                tmp_tbl_list->schema_table->addRow(table->record[0],
345
 
                                                   table->s->reclength);
 
344
                schema_table->addRow(table->record[0],
 
345
                                     table->s->reclength);
346
346
        }
347
347
 
348
348
        return(0);
462
462
/*=========================*/
463
463
        trx_i_s_cache_t*        cache,  /*!< in: cache to read from */
464
464
        Session*                session,/*!< in: MySQL client connection */
465
 
        Table*                  table)  /*!< in/out: fill this table */
 
465
        Table*                  table,  /*!< in/out: fill this table */
 
466
        drizzled::plugin::InfoSchemaTable *schema_table)
466
467
{
467
468
        Field** fields;
468
469
        ulint   rows_num;
552
553
                OK(field_store_string(fields[IDX_LOCK_DATA],
553
554
                                      row->lock_data));
554
555
 
555
 
                TableList *tmp_tbl_list= table->pos_in_table_list;
556
 
                tmp_tbl_list->schema_table->addRow(table->record[0],
557
 
                                                   table->s->reclength);
 
556
                schema_table->addRow(table->record[0],
 
557
                                     table->s->reclength);
558
558
        }
559
559
 
560
560
        return(0);
624
624
fill_innodb_lock_waits_from_cache(
625
625
/*==============================*/
626
626
        trx_i_s_cache_t*        cache,  /*!< in: cache to read from */
627
 
        Table*                  table)  /*!< in/out: fill this table */
 
627
        Table*                  table,  /*!< in/out: fill this table */
 
628
        drizzled::plugin::InfoSchemaTable *schema_table)
628
629
{
629
630
        Field** fields;
630
631
        ulint   rows_num;
676
677
                                   blocking_lock_id,
677
678
                                   sizeof(blocking_lock_id))));
678
679
 
679
 
                TableList *tmp_tbl_list= table->pos_in_table_list;
680
 
                tmp_tbl_list->schema_table->addRow(table->record[0],
681
 
                                                   table->s->reclength);
 
680
                schema_table->addRow(table->record[0],
 
681
                                     table->s->reclength);
682
682
        }
683
683
 
684
684
        return(0);
750
750
        if (innobase_strcasecmp(table_name, "innodb_trx") == 0) {
751
751
 
752
752
                if (fill_innodb_trx_from_cache(
753
 
                        cache, table) != 0) {
 
753
                        cache, table, schema_table) != 0) {
754
754
 
755
755
                        ret = 1;
756
756
                }
758
758
        } else if (innobase_strcasecmp(table_name, "innodb_locks") == 0) {
759
759
 
760
760
                if (fill_innodb_locks_from_cache(
761
 
                        cache, session, table) != 0) {
 
761
                        cache, session, table, schema_table) != 0) {
762
762
 
763
763
                        ret = 1;
764
764
                }
766
766
        } else if (innobase_strcasecmp(table_name, "innodb_lock_waits") == 0) {
767
767
 
768
768
                if (fill_innodb_lock_waits_from_cache(
769
 
                        cache, table) != 0) {
 
769
                        cache, table, schema_table) != 0) {
770
770
 
771
771
                        ret = 1;
772
772
                }