← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

Merge default plugin.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/i_s.cc
367
367
                        /* out: 0 on success */
368
368
        )       /* in/out: table schema object */
369
369
{
370
 
        if ((innodb_trx_schema_table= new drizzled::plugin::InfoSchemaTable) == NULL)
 
370
        if ((innodb_trx_schema_table= new drizzled::plugin::InfoSchemaTable("INNODB_TRX")) == NULL)
371
371
                return(1);
372
372
 
373
373
        innodb_trx_schema_table->setColumnInfo(innodb_trx_fields_info);
374
374
        innodb_trx_schema_table->setInfoSchemaMethods(&trx_methods);
375
 
        innodb_trx_schema_table->setTableName("INNODB_TRX");
376
375
 
377
376
        return(0);
378
377
}
590
589
        )       /* in/out: table schema object */
591
590
{
592
591
 
593
 
        if ((innodb_locks_schema_table= new drizzled::plugin::InfoSchemaTable) == NULL)
 
592
        if ((innodb_locks_schema_table= new drizzled::plugin::InfoSchemaTable("INNODB_LOCKS")) == NULL)
594
593
                return(1);
595
594
 
596
595
        innodb_locks_schema_table->setColumnInfo(innodb_locks_fields_info);
597
596
        innodb_locks_schema_table->setInfoSchemaMethods(&trx_methods);
598
 
        innodb_locks_schema_table->setTableName("INNODB_LOCKS");
599
597
        return(0);
600
598
}
601
599
 
720
718
        )
721
719
{
722
720
 
723
 
        if ((innodb_lock_waits_schema_table= new drizzled::plugin::InfoSchemaTable) == NULL)
 
721
        if ((innodb_lock_waits_schema_table= new drizzled::plugin::InfoSchemaTable("INNODB_LOCK_WAITS")) == NULL)
724
722
                return(1);
725
723
 
726
724
        innodb_lock_waits_schema_table->setColumnInfo(innodb_lock_waits_fields_info);
727
725
        innodb_lock_waits_schema_table->setInfoSchemaMethods(&trx_methods);
728
 
        innodb_lock_waits_schema_table->setTableName("INNODB_LOCK_WAITS");
729
726
 
730
727
 
731
728
        return(0);
968
965
        )
969
966
{
970
967
 
971
 
        if ((innodb_cmp_schema_table= new drizzled::plugin::InfoSchemaTable) == NULL)
 
968
        if ((innodb_cmp_schema_table= new drizzled::plugin::InfoSchemaTable("INNODB_CMP")) == NULL)
972
969
                return(1);
973
970
 
974
971
        innodb_cmp_schema_table->setColumnInfo(i_s_cmp_fields_info);
975
972
        innodb_cmp_schema_table->setInfoSchemaMethods(&cmp_methods);
976
 
        innodb_cmp_schema_table->setTableName("INNODB_CMP");
977
973
 
978
974
        return(0);
979
975
}
987
983
        )       /* in/out: table schema object */
988
984
{
989
985
 
990
 
        if ((innodb_cmp_reset_schema_table= new drizzled::plugin::InfoSchemaTable) == NULL)
 
986
        if ((innodb_cmp_reset_schema_table= new drizzled::plugin::InfoSchemaTable("INNODB_CMP_RESET")) == NULL)
991
987
                return(1);
992
988
 
993
989
        innodb_cmp_reset_schema_table->setColumnInfo(i_s_cmp_fields_info);
994
990
        innodb_cmp_reset_schema_table->setInfoSchemaMethods(&cmp_reset_methods);
995
 
        innodb_cmp_reset_schema_table->setTableName("INNODB_CMP_RESET");
996
991
 
997
992
        return(0);
998
993
}
1128
1123
        )
1129
1124
{
1130
1125
 
1131
 
        if ((innodb_cmpmem_schema_table= new drizzled::plugin::InfoSchemaTable) == NULL)
 
1126
        if ((innodb_cmpmem_schema_table= new drizzled::plugin::InfoSchemaTable("INNODB_CMPMEM")) == NULL)
1132
1127
                return(1);
1133
1128
 
1134
1129
        innodb_cmpmem_schema_table->setColumnInfo(i_s_cmpmem_fields_info);
1135
1130
        innodb_cmpmem_schema_table->setInfoSchemaMethods(&cmpmem_methods);
1136
 
        innodb_cmpmem_schema_table->setTableName("INNODB_CMPMEM");
1137
1131
 
1138
1132
        return(0);
1139
1133
}
1146
1140
                        /* out: 0 on success */
1147
1141
        )
1148
1142
{
1149
 
        if ((innodb_cmpmem_reset_schema_table= new drizzled::plugin::InfoSchemaTable) == NULL)
 
1143
        if ((innodb_cmpmem_reset_schema_table= new drizzled::plugin::InfoSchemaTable("INNODB_CMPMEM_RESET")) == NULL)
1150
1144
                return(1);
1151
1145
 
1152
1146
        innodb_cmpmem_reset_schema_table->setColumnInfo(i_s_cmpmem_fields_info);
1153
1147
        innodb_cmpmem_reset_schema_table->setInfoSchemaMethods(&cmpmem_reset_methods);
1154
 
        innodb_cmpmem_reset_schema_table->setTableName("INNODB_CMPMEM_RESET");
1155
 
 
1156
1148
        return(0);
1157
1149
}
1158
1150