← 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 Padraig

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/i_s.cc
369
369
{
370
370
        if ((innodb_trx_schema_table= new InfoSchemaTable) == NULL)
371
371
                return(1);
372
 
        memset(innodb_trx_schema_table, 0, sizeof(InfoSchemaTable));
373
372
 
374
373
        innodb_trx_schema_table->setColumnInfo(innodb_trx_fields_info);
375
374
        innodb_trx_schema_table->setInfoSchemaMethods(&trx_methods);
593
592
 
594
593
        if ((innodb_locks_schema_table= new InfoSchemaTable) == NULL)
595
594
                return(1);
596
 
        memset(innodb_locks_schema_table, 0, sizeof(InfoSchemaTable));
597
595
 
598
596
        innodb_locks_schema_table->setColumnInfo(innodb_locks_fields_info);
599
597
        innodb_locks_schema_table->setInfoSchemaMethods(&trx_methods);
724
722
 
725
723
        if ((innodb_lock_waits_schema_table= new InfoSchemaTable) == NULL)
726
724
                return(1);
727
 
        memset(innodb_lock_waits_schema_table, 0, sizeof(InfoSchemaTable));
728
725
 
729
726
        innodb_lock_waits_schema_table->setColumnInfo(innodb_lock_waits_fields_info);
730
727
        innodb_lock_waits_schema_table->setInfoSchemaMethods(&trx_methods);
973
970
 
974
971
        if ((innodb_cmp_schema_table= new InfoSchemaTable) == NULL)
975
972
                return(1);
976
 
        memset(innodb_cmp_schema_table, 0, sizeof(InfoSchemaTable));
977
 
 
978
973
 
979
974
        innodb_cmp_schema_table->setColumnInfo(i_s_cmp_fields_info);
980
975
        innodb_cmp_schema_table->setInfoSchemaMethods(&cmp_methods);
994
989
 
995
990
        if ((innodb_cmp_reset_schema_table= new InfoSchemaTable) == NULL)
996
991
                return(1);
997
 
        memset(innodb_cmp_reset_schema_table, 0, sizeof(InfoSchemaTable));
998
992
 
999
993
        innodb_cmp_reset_schema_table->setColumnInfo(i_s_cmp_fields_info);
1000
994
        innodb_cmp_reset_schema_table->setInfoSchemaMethods(&cmp_reset_methods);
1136
1130
 
1137
1131
        if ((innodb_cmpmem_schema_table= new InfoSchemaTable) == NULL)
1138
1132
                return(1);
1139
 
        memset(innodb_cmpmem_schema_table, 0, sizeof(InfoSchemaTable));
1140
1133
 
1141
1134
        innodb_cmpmem_schema_table->setColumnInfo(i_s_cmpmem_fields_info);
1142
1135
        innodb_cmpmem_schema_table->setInfoSchemaMethods(&cmpmem_methods);
1155
1148
{
1156
1149
        if ((innodb_cmpmem_reset_schema_table= new InfoSchemaTable) == NULL)
1157
1150
                return(1);
1158
 
        memset(innodb_cmpmem_reset_schema_table, 0, sizeof(InfoSchemaTable));
1159
1151
 
1160
1152
        innodb_cmpmem_reset_schema_table->setColumnInfo(i_s_cmpmem_fields_info);
1161
1153
        innodb_cmpmem_reset_schema_table->setInfoSchemaMethods(&cmpmem_reset_methods);