← 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: Monty Taylor
  • Date: 2010-02-04 08:14:46 UTC
  • mfrom: (1277.2.1 build) (1280.2.1 build)
  • mto: This revision was merged to the branch mainline in revision 1283.
  • Revision ID: mordred@inaugust.com-20100204081446-ldh9m486va30uap6
Put everything in drizzled into drizzled namespace.
Put internal stuff into drizzled::internal namespace.
Removed some cruft.
Now every symbol that is shipped in a header is in the drizzled namespace
and everything in the server that's not shipped is labeled internal. woot. 
Removed a lot of the extra extern "C" stuff that was in there. Less ugliness for
internal callbacks now for Sun Studio.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/i_s.cc
33
33
#include <drizzled/field.h>
34
34
#include <drizzled/table.h>
35
35
#include <drizzled/plugin/info_schema_table.h>
 
36
#include <drizzled/time_functions.h>
36
37
#include "drizzled/global_charset_info.h"
37
38
 
38
39
 
49
50
}
50
51
#include "handler0vars.h"
51
52
 
 
53
using namespace drizzled;
 
54
 
52
55
static const char plugin_author[] = "Innobase Oy";
53
56
 
54
57
#define OK(expr)                \
71
74
 
72
75
#define STRUCT_FLD(name, value) value
73
76
 
74
 
drizzled::plugin::InfoSchemaTable *innodb_trx_schema_table= NULL;
75
 
drizzled::plugin::InfoSchemaTable *innodb_locks_schema_table= NULL;
76
 
drizzled::plugin::InfoSchemaTable *innodb_lock_waits_schema_table= NULL;
77
 
drizzled::plugin::InfoSchemaTable *innodb_cmp_schema_table= NULL;
78
 
drizzled::plugin::InfoSchemaTable *innodb_cmp_reset_schema_table= NULL;
79
 
drizzled::plugin::InfoSchemaTable *innodb_cmpmem_schema_table= NULL;
80
 
drizzled::plugin::InfoSchemaTable *innodb_cmpmem_reset_schema_table= NULL;
 
77
plugin::InfoSchemaTable *innodb_trx_schema_table= NULL;
 
78
plugin::InfoSchemaTable *innodb_locks_schema_table= NULL;
 
79
plugin::InfoSchemaTable *innodb_lock_waits_schema_table= NULL;
 
80
plugin::InfoSchemaTable *innodb_cmp_schema_table= NULL;
 
81
plugin::InfoSchemaTable *innodb_cmp_reset_schema_table= NULL;
 
82
plugin::InfoSchemaTable *innodb_cmpmem_schema_table= NULL;
 
83
plugin::InfoSchemaTable *innodb_cmpmem_reset_schema_table= NULL;
81
84
 
82
85
static TrxISMethods trx_methods;
83
86
static CmpISMethods cmp_methods;
113
116
---------------------------------
114
117
*/
115
118
 
116
 
/* XXX these are defined in mysql_priv.h inside #ifdef DRIZZLE_SERVER */
117
 
void localtime_to_TIME(DRIZZLE_TIME *to, struct tm *from);
118
 
 
119
119
/*******************************************************************//**
120
120
Auxiliary function to store time_t value in MYSQL_TYPE_DATETIME
121
121
field.
198
198
}
199
199
 
200
200
/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_trx */
201
 
static drizzled::plugin::ColumnInfo     innodb_trx_fields_info[] =
 
201
static plugin::ColumnInfo       innodb_trx_fields_info[] =
202
202
{
203
203
#define IDX_TRX_ID              0
204
 
        drizzled::plugin::ColumnInfo("trx_id",
 
204
        plugin::ColumnInfo("trx_id",
205
205
                  TRX_ID_MAX_LEN + 1,
206
206
                  DRIZZLE_TYPE_VARCHAR,
207
207
                  0,
209
209
                  ""),
210
210
 
211
211
#define IDX_TRX_STATE           1
212
 
        drizzled::plugin::ColumnInfo("trx_state",
 
212
        plugin::ColumnInfo("trx_state",
213
213
                  TRX_QUE_STATE_STR_MAX_LEN + 1,
214
214
                  DRIZZLE_TYPE_VARCHAR,
215
215
                  0,
217
217
                  ""),
218
218
 
219
219
#define IDX_TRX_STARTED         2
220
 
        drizzled::plugin::ColumnInfo("trx_started",
 
220
        plugin::ColumnInfo("trx_started",
221
221
                  0,
222
222
                  DRIZZLE_TYPE_DATETIME,
223
223
                  0,
225
225
                  ""),
226
226
 
227
227
#define IDX_TRX_REQUESTED_LOCK_ID       3
228
 
        drizzled::plugin::ColumnInfo("trx_requested_lock_id",
 
228
        plugin::ColumnInfo("trx_requested_lock_id",
229
229
                  TRX_I_S_LOCK_ID_MAX_LEN + 1,
230
230
                  DRIZZLE_TYPE_VARCHAR,
231
231
                  0,
233
233
                  ""),
234
234
 
235
235
#define IDX_TRX_WAIT_STARTED    4
236
 
        drizzled::plugin::ColumnInfo("trx_wait_started",
 
236
        plugin::ColumnInfo("trx_wait_started",
237
237
                  0,
238
238
                  DRIZZLE_TYPE_DATETIME,
239
239
                  0,
241
241
                  ""),
242
242
 
243
243
#define IDX_TRX_WEIGHT          5
244
 
        drizzled::plugin::ColumnInfo("trx_weight",
 
244
        plugin::ColumnInfo("trx_weight",
245
245
                  MY_INT64_NUM_DECIMAL_DIGITS,
246
246
                  DRIZZLE_TYPE_LONGLONG,
247
247
                  0,
249
249
                  ""),
250
250
 
251
251
#define IDX_TRX_DRIZZLE_THREAD_ID       6
252
 
        drizzled::plugin::ColumnInfo("trx_mysql_thread_id",
 
252
        plugin::ColumnInfo("trx_mysql_thread_id",
253
253
                  MY_INT64_NUM_DECIMAL_DIGITS,
254
254
                  DRIZZLE_TYPE_LONGLONG,
255
255
                  0,
257
257
                  ""),
258
258
 
259
259
#define IDX_TRX_QUERY           7
260
 
        drizzled::plugin::ColumnInfo("trx_query",
 
260
        plugin::ColumnInfo("trx_query",
261
261
                  TRX_I_S_TRX_QUERY_MAX_LEN,
262
262
                  DRIZZLE_TYPE_VARCHAR,
263
263
                  0,
264
264
                  MY_I_S_MAYBE_NULL,
265
265
                  ""),
266
266
 
267
 
        drizzled::plugin::ColumnInfo()
 
267
        plugin::ColumnInfo()
268
268
};
269
269
 
270
270
/*******************************************************************//**
277
277
/*=======================*/
278
278
        trx_i_s_cache_t*        cache,  /*!< in: cache to read from */
279
279
        Table*                  table,  /*!< in/out: fill this table */
280
 
        drizzled::plugin::InfoSchemaTable *schema_table)
 
280
        plugin::InfoSchemaTable *schema_table)
281
281
{
282
282
        Field** fields;
283
283
        ulint   rows_num;
357
357
innodb_trx_init()
358
358
/*============*/
359
359
{
360
 
        if ((innodb_trx_schema_table= new drizzled::plugin::InfoSchemaTable("INNODB_TRX")) == NULL)
 
360
        if ((innodb_trx_schema_table= new plugin::InfoSchemaTable("INNODB_TRX")) == NULL)
361
361
                return(1);
362
362
 
363
363
        innodb_trx_schema_table->setColumnInfo(innodb_trx_fields_info);
368
368
 
369
369
 
370
370
/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_locks */
371
 
static drizzled::plugin::ColumnInfo innodb_locks_fields_info[] =
 
371
static plugin::ColumnInfo innodb_locks_fields_info[] =
372
372
{
373
373
#define IDX_LOCK_ID             0
374
 
        drizzled::plugin::ColumnInfo("lock_id",
 
374
        plugin::ColumnInfo("lock_id",
375
375
                  TRX_I_S_LOCK_ID_MAX_LEN + 1,
376
376
                  DRIZZLE_TYPE_VARCHAR,
377
377
                  0,
379
379
                  ""),
380
380
 
381
381
#define IDX_LOCK_TRX_ID         1
382
 
        drizzled::plugin::ColumnInfo("lock_trx_id",
 
382
        plugin::ColumnInfo("lock_trx_id",
383
383
                  TRX_ID_MAX_LEN + 1,
384
384
                  DRIZZLE_TYPE_VARCHAR,
385
385
                  0,
387
387
                  ""),
388
388
 
389
389
#define IDX_LOCK_MODE           2
390
 
        drizzled::plugin::ColumnInfo("lock_mode",
 
390
        plugin::ColumnInfo("lock_mode",
391
391
         /* S[,GAP] X[,GAP] IS[,GAP] IX[,GAP] AUTO_INC UNKNOWN */
392
392
                  32,
393
393
                  DRIZZLE_TYPE_VARCHAR,
396
396
                  ""),
397
397
 
398
398
#define IDX_LOCK_TYPE           3
399
 
        drizzled::plugin::ColumnInfo("lock_type",
 
399
        plugin::ColumnInfo("lock_type",
400
400
                  32, /* RECORD|TABLE|UNKNOWN */
401
401
                  DRIZZLE_TYPE_VARCHAR,
402
402
                  0,
404
404
                  ""),
405
405
 
406
406
#define IDX_LOCK_TABLE          4
407
 
        drizzled::plugin::ColumnInfo("lock_table",
 
407
        plugin::ColumnInfo("lock_table",
408
408
                  1024,
409
409
                  DRIZZLE_TYPE_VARCHAR,
410
410
                  0,
412
412
                  ""),
413
413
 
414
414
#define IDX_LOCK_INDEX          5
415
 
        drizzled::plugin::ColumnInfo("lock_index",
 
415
        plugin::ColumnInfo("lock_index",
416
416
                  1024,
417
417
                  DRIZZLE_TYPE_VARCHAR,
418
418
                  0,
420
420
                  ""),
421
421
 
422
422
#define IDX_LOCK_SPACE          6
423
 
        drizzled::plugin::ColumnInfo("lock_space",
 
423
        plugin::ColumnInfo("lock_space",
424
424
                  MY_INT64_NUM_DECIMAL_DIGITS,
425
425
                  DRIZZLE_TYPE_LONGLONG,
426
426
                  0,
428
428
                  ""),
429
429
 
430
430
#define IDX_LOCK_PAGE           7
431
 
        drizzled::plugin::ColumnInfo("lock_page",
 
431
        plugin::ColumnInfo("lock_page",
432
432
                  MY_INT64_NUM_DECIMAL_DIGITS,
433
433
                  DRIZZLE_TYPE_LONGLONG,
434
434
                  0,
436
436
                  ""),
437
437
 
438
438
#define IDX_LOCK_REC            8
439
 
        drizzled::plugin::ColumnInfo("lock_rec",
 
439
        plugin::ColumnInfo("lock_rec",
440
440
                  MY_INT64_NUM_DECIMAL_DIGITS,
441
441
                  DRIZZLE_TYPE_LONGLONG,
442
442
                  0,
444
444
                  ""),
445
445
 
446
446
#define IDX_LOCK_DATA           9
447
 
        drizzled::plugin::ColumnInfo("lock_data",
 
447
        plugin::ColumnInfo("lock_data",
448
448
                  TRX_I_S_LOCK_DATA_MAX_LEN,
449
449
                  DRIZZLE_TYPE_VARCHAR,
450
450
                  0,
451
451
                  MY_I_S_MAYBE_NULL,
452
452
                  ""),
453
453
 
454
 
        drizzled::plugin::ColumnInfo()
 
454
        plugin::ColumnInfo()
455
455
};
456
456
 
457
457
/*******************************************************************//**
465
465
        trx_i_s_cache_t*        cache,  /*!< in: cache to read from */
466
466
        Session*                session,/*!< in: MySQL client connection */
467
467
        Table*                  table,  /*!< in/out: fill this table */
468
 
        drizzled::plugin::InfoSchemaTable *schema_table)
 
468
        plugin::InfoSchemaTable *schema_table)
469
469
{
470
470
        Field** fields;
471
471
        ulint   rows_num;
570
570
/*==============*/
571
571
{
572
572
 
573
 
        if ((innodb_locks_schema_table= new drizzled::plugin::InfoSchemaTable("INNODB_LOCKS")) == NULL)
 
573
        if ((innodb_locks_schema_table= new plugin::InfoSchemaTable("INNODB_LOCKS")) == NULL)
574
574
                return(1);
575
575
 
576
576
        innodb_locks_schema_table->setColumnInfo(innodb_locks_fields_info);
580
580
 
581
581
 
582
582
/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_lock_waits */
583
 
static drizzled::plugin::ColumnInfo innodb_lock_waits_fields_info[] =
 
583
static plugin::ColumnInfo innodb_lock_waits_fields_info[] =
584
584
{
585
585
#define IDX_REQUESTING_TRX_ID   0
586
 
        drizzled::plugin::ColumnInfo("requesting_trx_id",
 
586
        plugin::ColumnInfo("requesting_trx_id",
587
587
                  TRX_ID_MAX_LEN + 1,
588
588
                  DRIZZLE_TYPE_VARCHAR,
589
589
                  0,
591
591
                  ""),
592
592
 
593
593
#define IDX_REQUESTED_LOCK_ID   1
594
 
        drizzled::plugin::ColumnInfo("requested_lock_id",
 
594
        plugin::ColumnInfo("requested_lock_id",
595
595
                  TRX_I_S_LOCK_ID_MAX_LEN + 1,
596
596
                  DRIZZLE_TYPE_VARCHAR,
597
597
                  0,
599
599
                  ""),
600
600
 
601
601
#define IDX_BLOCKING_TRX_ID     2
602
 
        drizzled::plugin::ColumnInfo("blocking_trx_id",
 
602
        plugin::ColumnInfo("blocking_trx_id",
603
603
                  TRX_ID_MAX_LEN + 1,
604
604
                  DRIZZLE_TYPE_VARCHAR,
605
605
                  0,
607
607
                  ""),
608
608
 
609
609
#define IDX_BLOCKING_LOCK_ID    3
610
 
        drizzled::plugin::ColumnInfo("blocking_lock_id",
 
610
        plugin::ColumnInfo("blocking_lock_id",
611
611
                  TRX_I_S_LOCK_ID_MAX_LEN + 1,
612
612
                  DRIZZLE_TYPE_VARCHAR,
613
613
                  0,
614
614
                  0,
615
615
                  ""),
616
616
 
617
 
        drizzled::plugin::ColumnInfo()
 
617
        plugin::ColumnInfo()
618
618
};
619
619
 
620
620
/*******************************************************************//**
627
627
/*==============================*/
628
628
        trx_i_s_cache_t*        cache,  /*!< in: cache to read from */
629
629
        Table*                  table,  /*!< in/out: fill this table */
630
 
        drizzled::plugin::InfoSchemaTable *schema_table)
 
630
        plugin::InfoSchemaTable *schema_table)
631
631
{
632
632
        Field** fields;
633
633
        ulint   rows_num;
694
694
/*===================*/
695
695
{
696
696
 
697
 
        if ((innodb_lock_waits_schema_table= new drizzled::plugin::InfoSchemaTable("INNODB_LOCK_WAITS")) == NULL)
 
697
        if ((innodb_lock_waits_schema_table= new plugin::InfoSchemaTable("INNODB_LOCK_WAITS")) == NULL)
698
698
                return(1);
699
699
 
700
700
        innodb_lock_waits_schema_table->setColumnInfo(innodb_lock_waits_fields_info);
716
716
/*======================*/
717
717
        Session*        session,/*!< in: thread */
718
718
        Table*  table,  /*!< in/out: tables to fill */
719
 
        drizzled::plugin::InfoSchemaTable *schema_table)
 
719
        plugin::InfoSchemaTable *schema_table)
720
720
{
721
721
        const char*             table_name;
722
722
        int                     ret;
800
800
}
801
801
 
802
802
/* Fields of the dynamic table information_schema.innodb_cmp. */
803
 
static drizzled::plugin::ColumnInfo     i_s_cmp_fields_info[] =
 
803
static plugin::ColumnInfo       i_s_cmp_fields_info[] =
804
804
{
805
 
        drizzled::plugin::ColumnInfo("page_size",
 
805
        plugin::ColumnInfo("page_size",
806
806
                  5,
807
807
                  DRIZZLE_TYPE_LONG,
808
808
                  0,
809
809
                  0,
810
810
                  "Compressed Page Size"),
811
811
 
812
 
        drizzled::plugin::ColumnInfo("compress_ops",
 
812
        plugin::ColumnInfo("compress_ops",
813
813
                  MY_INT32_NUM_DECIMAL_DIGITS,
814
814
                  DRIZZLE_TYPE_LONG,
815
815
                  0,
816
816
                  0,
817
817
                  "Total Number of Compressions"),
818
818
 
819
 
        drizzled::plugin::ColumnInfo("compress_ops_ok",
 
819
        plugin::ColumnInfo("compress_ops_ok",
820
820
                  MY_INT32_NUM_DECIMAL_DIGITS,
821
821
                  DRIZZLE_TYPE_LONG,
822
822
                  0,
823
823
                  0,
824
824
                  "Total Number of Successful Compressions"),
825
825
 
826
 
        drizzled::plugin::ColumnInfo("compress_time",
 
826
        plugin::ColumnInfo("compress_time",
827
827
                  MY_INT32_NUM_DECIMAL_DIGITS,
828
828
                  DRIZZLE_TYPE_LONG,
829
829
                  0,
830
830
                  0,
831
831
                  "Total Duration of Compressions in Seconds"),
832
832
 
833
 
        drizzled::plugin::ColumnInfo("uncompress_ops",
 
833
        plugin::ColumnInfo("uncompress_ops",
834
834
                  MY_INT32_NUM_DECIMAL_DIGITS,
835
835
                  DRIZZLE_TYPE_LONG,
836
836
                  0,
837
837
                  0,
838
838
                  "Total Number of Decompressions"),
839
839
 
840
 
        drizzled::plugin::ColumnInfo("uncompress_time",
 
840
        plugin::ColumnInfo("uncompress_time",
841
841
                  MY_INT32_NUM_DECIMAL_DIGITS,
842
842
                  DRIZZLE_TYPE_LONG,
843
843
                  0,
844
844
                  0,
845
845
                  "Total Duration of Decompressions in Seconds"),
846
846
 
847
 
        drizzled::plugin::ColumnInfo()
 
847
        plugin::ColumnInfo()
848
848
};
849
849
 
850
850
 
858
858
/*=============*/
859
859
        Session*        session,/*!< in: thread */
860
860
        Table*  table,  /*!< in/out: tables to fill */
861
 
        drizzled::plugin::InfoSchemaTable *schema_table,
 
861
        plugin::InfoSchemaTable *schema_table,
862
862
        ibool           reset)  /*!< in: TRUE=reset cumulated counts */
863
863
{
864
864
        int     status  = 0;
904
904
/*=========*/
905
905
        Session*        session,/*!< in: thread */
906
906
        Table*  table,  /*!< in/out: tables to fill */
907
 
        drizzled::plugin::InfoSchemaTable *schema_table)
 
907
        plugin::InfoSchemaTable *schema_table)
908
908
{
909
909
        return(i_s_cmp_fill_low(session, table, schema_table, FALSE));
910
910
}
917
917
/*===============*/
918
918
        Session*        session,/*!< in: thread */
919
919
        Table*  table,  /*!< in/out: tables to fill */
920
 
        drizzled::plugin::InfoSchemaTable *schema_table)
 
920
        plugin::InfoSchemaTable *schema_table)
921
921
{
922
922
        return(i_s_cmp_fill_low(session, table, schema_table, TRUE));
923
923
}
930
930
/*=========*/
931
931
{
932
932
 
933
 
        if ((innodb_cmp_schema_table= new drizzled::plugin::InfoSchemaTable("INNODB_CMP")) == NULL)
 
933
        if ((innodb_cmp_schema_table= new plugin::InfoSchemaTable("INNODB_CMP")) == NULL)
934
934
                return(1);
935
935
 
936
936
        innodb_cmp_schema_table->setColumnInfo(i_s_cmp_fields_info);
947
947
/*===============*/
948
948
{
949
949
 
950
 
        if ((innodb_cmp_reset_schema_table= new drizzled::plugin::InfoSchemaTable("INNODB_CMP_RESET")) == NULL)
 
950
        if ((innodb_cmp_reset_schema_table= new plugin::InfoSchemaTable("INNODB_CMP_RESET")) == NULL)
951
951
                return(1);
952
952
 
953
953
        innodb_cmp_reset_schema_table->setColumnInfo(i_s_cmp_fields_info);
959
959
 
960
960
 
961
961
/* Fields of the dynamic table information_schema.innodb_cmpmem. */
962
 
static drizzled::plugin::ColumnInfo     i_s_cmpmem_fields_info[] =
 
962
static plugin::ColumnInfo       i_s_cmpmem_fields_info[] =
963
963
{
964
 
        drizzled::plugin::ColumnInfo("page_size",
 
964
        plugin::ColumnInfo("page_size",
965
965
                  5,
966
966
                  DRIZZLE_TYPE_LONG,
967
967
                  0,
968
968
                  0,
969
969
                  "Buddy Block Size"),
970
970
 
971
 
        drizzled::plugin::ColumnInfo("pages_used",
 
971
        plugin::ColumnInfo("pages_used",
972
972
                  MY_INT32_NUM_DECIMAL_DIGITS,
973
973
                  DRIZZLE_TYPE_LONG,
974
974
                  0,
975
975
                  0,
976
976
                  "Currently in Use"),
977
977
 
978
 
        drizzled::plugin::ColumnInfo("pages_free",
 
978
        plugin::ColumnInfo("pages_free",
979
979
                  MY_INT32_NUM_DECIMAL_DIGITS,
980
980
                  DRIZZLE_TYPE_LONG,
981
981
                  0,
982
982
                  0,
983
983
                  "Currently Available"),
984
984
 
985
 
        drizzled::plugin::ColumnInfo("relocation_ops",
 
985
        plugin::ColumnInfo("relocation_ops",
986
986
                  MY_INT64_NUM_DECIMAL_DIGITS,
987
987
                  DRIZZLE_TYPE_LONGLONG,
988
988
                  0,
989
989
                  0,
990
990
                  "Total Number of Relocations"),
991
991
 
992
 
        drizzled::plugin::ColumnInfo("relocation_time",
 
992
        plugin::ColumnInfo("relocation_time",
993
993
                  MY_INT32_NUM_DECIMAL_DIGITS,
994
994
                  DRIZZLE_TYPE_LONG,
995
995
                  0,
996
996
                  0,
997
997
                  "Total Duration of Relocations, in Seconds"),
998
998
 
999
 
        drizzled::plugin::ColumnInfo()
 
999
        plugin::ColumnInfo()
1000
1000
};
1001
1001
 
1002
1002
/*******************************************************************//**
1009
1009
/*================*/
1010
1010
        Session*        session,/*!< in: thread */
1011
1011
        Table*  table,  /*!< in/out: tables to fill */
1012
 
        drizzled::plugin::InfoSchemaTable *schema_table,
 
1012
        plugin::InfoSchemaTable *schema_table,
1013
1013
        ibool           reset)  /*!< in: TRUE=reset cumulated counts */
1014
1014
{
1015
1015
        int     status  = 0;
1052
1052
/*============*/
1053
1053
        Session*        session,/*!< in: thread */
1054
1054
        Table*  table, /*!< in/out: tables to fill */
1055
 
        drizzled::plugin::InfoSchemaTable *schema_table)        
 
1055
        plugin::InfoSchemaTable *schema_table)  
1056
1056
{
1057
1057
        return(i_s_cmpmem_fill_low(session, table, schema_table, FALSE));
1058
1058
}
1065
1065
/*==================*/
1066
1066
        Session*        session,/*!< in: thread */
1067
1067
        Table*  table,  /*!< in/out: tables to fill */
1068
 
        drizzled::plugin::InfoSchemaTable *schema_table)
 
1068
        plugin::InfoSchemaTable *schema_table)
1069
1069
{
1070
1070
        return(i_s_cmpmem_fill_low(session, table, schema_table, TRUE));
1071
1071
}
1078
1078
/*============*/
1079
1079
{
1080
1080
 
1081
 
        if ((innodb_cmpmem_schema_table= new drizzled::plugin::InfoSchemaTable("INNODB_CMPMEM")) == NULL)
 
1081
        if ((innodb_cmpmem_schema_table= new plugin::InfoSchemaTable("INNODB_CMPMEM")) == NULL)
1082
1082
                return(1);
1083
1083
 
1084
1084
        innodb_cmpmem_schema_table->setColumnInfo(i_s_cmpmem_fields_info);
1094
1094
i_s_cmpmem_reset_init()
1095
1095
/*==================*/
1096
1096
{
1097
 
        if ((innodb_cmpmem_reset_schema_table= new drizzled::plugin::InfoSchemaTable("INNODB_CMPMEM_RESET")) == NULL)
 
1097
        if ((innodb_cmpmem_reset_schema_table= new plugin::InfoSchemaTable("INNODB_CMPMEM_RESET")) == NULL)
1098
1098
                return(1);
1099
1099
 
1100
1100
        innodb_cmpmem_reset_schema_table->setColumnInfo(i_s_cmpmem_fields_info);
1109
1109
int
1110
1110
i_s_common_deinit(
1111
1111
/*==============*/
1112
 
        drizzled::plugin::Registry &registry)   /*!< in/out: table schema object */
 
1112
        plugin::Registry &registry)     /*!< in/out: table schema object */
1113
1113
{
1114
1114
        registry.remove(innodb_trx_schema_table);
1115
1115
        registry.remove(innodb_locks_schema_table);