← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Monty Taylor
  • Date: 2009-04-10 22:18:10 UTC
  • mto: (992.1.1 mordred)
  • mto: This revision was merged to the branch mainline in revision 990.
  • Revision ID: mordred@inaugust.com-20090410221810-06j7dfgl1iso0dab
Did the finalizers. Renamed plugin_registry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/handler/i_s.cc
137
137
i_s_common_deinit(
138
138
/*==============*/
139
139
                        /* out: 0 on success */
140
 
        void*   );      /* in/out: table schema object */
 
140
        PluginRegistry &registry);      /* in/out: plugin registry object */
141
141
 
142
142
/***********************************************************************
143
143
Auxiliary function to store time_t value in DRIZZLE_TYPE_DATETIME
388
388
innodb_trx_init(
389
389
/*============*/
390
390
                        /* out: 0 on success */
391
 
        Plugin_registry &registry)      /* in/out: table schema object */
 
391
        PluginRegistry &registry)       /* in/out: table schema object */
392
392
{
393
393
        if ((innodb_trx_schema_table= new ST_SCHEMA_TABLE) == NULL)
394
394
                return(1);
398
398
        innodb_trx_schema_table->fill_table = trx_i_s_common_fill_table;
399
399
        innodb_trx_schema_table->table_name= "INNODB_TRX";
400
400
 
401
 
        registry.registerPlugin(innodb_trx_schema_table);
 
401
        registry.add(innodb_trx_schema_table);
402
402
 
403
403
        return(0);
404
404
}
658
658
innodb_locks_init(
659
659
/*==============*/
660
660
                        /* out: 0 on success */
661
 
        Plugin_registry &registry)      /* in/out: table schema object */
 
661
        PluginRegistry &registry)       /* in/out: table schema object */
662
662
{
663
663
 
664
664
        if ((innodb_locks_schema_table= new ST_SCHEMA_TABLE) == NULL)
668
668
        innodb_locks_schema_table->fields_info = innodb_locks_fields_info;
669
669
        innodb_locks_schema_table->fill_table = trx_i_s_common_fill_table;
670
670
        innodb_locks_schema_table->table_name= "INNODB_LOCKS";
671
 
        registry.registerPlugin(innodb_locks_schema_table);
 
671
        registry.add(innodb_locks_schema_table);
672
672
        return(0);
673
673
}
674
674
 
835
835
innodb_lock_waits_init(
836
836
/*===================*/
837
837
                        /* out: 0 on success */
838
 
        Plugin_registry &registry)      /* in/out: table schema object */
 
838
        PluginRegistry &registry)       /* in/out: table schema object */
839
839
{
840
840
 
841
841
        if ((innodb_lock_waits_schema_table= new ST_SCHEMA_TABLE) == NULL)
846
846
        innodb_lock_waits_schema_table->fill_table = trx_i_s_common_fill_table;
847
847
        innodb_lock_waits_schema_table->table_name= "INNODB_LOCK_WAITS";
848
848
 
849
 
        registry.registerPlugin(innodb_lock_waits_schema_table);        
 
849
        registry.add(innodb_lock_waits_schema_table);   
850
850
 
851
851
        return(0);
852
852
}
1136
1136
i_s_cmp_init(
1137
1137
/*=========*/
1138
1138
                        /* out: 0 on success */
1139
 
        Plugin_registry &registry)      /* in/out: table schema object */
 
1139
        PluginRegistry &registry)       /* in/out: table schema object */
1140
1140
{
1141
1141
 
1142
1142
        if ((innodb_cmp_schema_table= new ST_SCHEMA_TABLE) == NULL)
1148
1148
        innodb_cmp_schema_table->fill_table = i_s_cmp_fill;
1149
1149
        innodb_cmp_schema_table->table_name= "INNODB_CMP";
1150
1150
 
1151
 
        registry.registerPlugin(innodb_cmp_schema_table);
 
1151
        registry.add(innodb_cmp_schema_table);
1152
1152
        return(0);
1153
1153
}
1154
1154
 
1159
1159
i_s_cmp_reset_init(
1160
1160
/*===============*/
1161
1161
                        /* out: 0 on success */
1162
 
        Plugin_registry &registry)      /* in/out: table schema object */
 
1162
        PluginRegistry &registry)       /* in/out: table schema object */
1163
1163
{
1164
1164
 
1165
1165
        if ((innodb_cmp_reset_schema_table= new ST_SCHEMA_TABLE) == NULL)
1170
1170
        innodb_cmp_reset_schema_table->fill_table = i_s_cmp_reset_fill;
1171
1171
        innodb_cmp_reset_schema_table->table_name= "INNODB_CMP_RESET";
1172
1172
 
1173
 
        registry.registerPlugin(innodb_cmp_reset_schema_table);
 
1173
        registry.add(innodb_cmp_reset_schema_table);
1174
1174
        return(0);
1175
1175
}
1176
1176
 
1395
1395
i_s_cmpmem_init(
1396
1396
/*============*/
1397
1397
                        /* out: 0 on success */
1398
 
        Plugin_registry &registry)      /* in/out: table schema object */
 
1398
        PluginRegistry &registry)       /* in/out: table schema object */
1399
1399
{
1400
1400
 
1401
1401
        if ((innodb_cmpmem_schema_table= new ST_SCHEMA_TABLE) == NULL)
1406
1406
        innodb_cmpmem_schema_table->fill_table = i_s_cmpmem_fill;
1407
1407
        innodb_cmpmem_schema_table->table_name= "INNODB_CMPMEM";
1408
1408
 
1409
 
        registry.registerPlugin(innodb_cmpmem_schema_table);
 
1409
        registry.add(innodb_cmpmem_schema_table);
1410
1410
        return(0);
1411
1411
}
1412
1412
 
1417
1417
i_s_cmpmem_reset_init(
1418
1418
/*==================*/
1419
1419
                        /* out: 0 on success */
1420
 
        Plugin_registry &registry)      /* in/out: table schema object */
 
1420
        PluginRegistry &registry)       /* in/out: table schema object */
1421
1421
{
1422
1422
        if ((innodb_cmpmem_reset_schema_table= new ST_SCHEMA_TABLE) == NULL)
1423
1423
                return(1);
1427
1427
        innodb_cmpmem_reset_schema_table->fill_table = i_s_cmpmem_reset_fill;
1428
1428
        innodb_cmpmem_reset_schema_table->table_name= "INNODB_CMPMEM_RESET";
1429
1429
 
1430
 
        registry.registerPlugin(innodb_cmpmem_reset_schema_table);
 
1430
        registry.add(innodb_cmpmem_reset_schema_table);
1431
1431
        return(0);
1432
1432
}
1433
1433
 
1529
1529
i_s_common_deinit(
1530
1530
/*==============*/
1531
1531
                        /* out: 0 on success */
1532
 
        void*   )       /* in/out: table schema object */
 
1532
        PluginRegistry &registry)       /* in/out: table schema object */
1533
1533
{
 
1534
        registry.remove(innodb_trx_schema_table);
 
1535
        registry.remove(innodb_locks_schema_table);
 
1536
        registry.remove(innodb_lock_waits_schema_table);
 
1537
        registry.remove(innodb_cmp_schema_table);
 
1538
        registry.remove(innodb_cmp_reset_schema_table);
 
1539
        registry.remove(innodb_cmpmem_schema_table);
 
1540
        registry.remove(innodb_cmpmem_reset_schema_table);
 
1541
 
1534
1542
        delete innodb_trx_schema_table;
1535
1543
        delete innodb_locks_schema_table;
1536
1544
        delete innodb_lock_waits_schema_table;