~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-06-19 20:17:46 UTC
  • mto: This revision was merged to the branch mainline in revision 1067.
  • Revision ID: osullivan.padraig@gmail.com-20090619201746-sw9j9hkqshv9hv5k
Converted the ST_FIELDS_INFO structure to a class named FieldInfo. Made all
data members of this class private and provided getters for every data
member. No setters are needed since this data is never modified once a field
is created. Updated the appropriate files which use FieldInfo.

Show diffs side-by-side

added added

removed removed

Lines of Context:
82
82
static CmpmemISMethods cmpmem_methods;
83
83
static CmpmemResetISMethods cmpmem_reset_methods;
84
84
 
85
 
static const ST_FIELD_INFO END_OF_ST_FIELD_INFO =
86
 
        {STRUCT_FLD(field_name,         NULL),
87
 
         STRUCT_FLD(field_length,       0),
88
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_NULL),
89
 
         STRUCT_FLD(value,              0),
90
 
         STRUCT_FLD(field_flags,        0),
91
 
         STRUCT_FLD(old_name,           ""),
92
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)};
93
 
 
94
85
/*
95
86
Use the following types mapping:
96
87
 
208
199
}
209
200
 
210
201
/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_trx */
211
 
static ST_FIELD_INFO    innodb_trx_fields_info[] =
 
202
static FieldInfo        innodb_trx_fields_info[] =
212
203
{
213
204
#define IDX_TRX_ID              0
214
 
        {STRUCT_FLD(field_name,         "trx_id"),
215
 
         STRUCT_FLD(field_length,       TRX_ID_MAX_LEN + 1),
216
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_VARCHAR),
217
 
         STRUCT_FLD(value,              0),
218
 
         STRUCT_FLD(field_flags,        0),
219
 
         STRUCT_FLD(old_name,           ""),
220
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
 
205
        FieldInfo("trx_id",
 
206
                  TRX_ID_MAX_LEN + 1,
 
207
                  DRIZZLE_TYPE_VARCHAR,
 
208
                  0,
 
209
                  0,
 
210
                  "",
 
211
                  SKIP_OPEN_TABLE),
221
212
 
222
213
#define IDX_TRX_STATE           1
223
 
        {STRUCT_FLD(field_name,         "trx_state"),
224
 
         STRUCT_FLD(field_length,       TRX_QUE_STATE_STR_MAX_LEN + 1),
225
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_VARCHAR),
226
 
         STRUCT_FLD(value,              0),
227
 
         STRUCT_FLD(field_flags,        0),
228
 
         STRUCT_FLD(old_name,           ""),
229
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
 
214
        FieldInfo("trx_state",
 
215
                  TRX_QUE_STATE_STR_MAX_LEN + 1,
 
216
                  DRIZZLE_TYPE_VARCHAR,
 
217
                  0,
 
218
                  0,
 
219
                  "",
 
220
                  SKIP_OPEN_TABLE),
230
221
 
231
222
#define IDX_TRX_STARTED         2
232
 
        {STRUCT_FLD(field_name,         "trx_started"),
233
 
         STRUCT_FLD(field_length,       0),
234
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_DATETIME),
235
 
         STRUCT_FLD(value,              0),
236
 
         STRUCT_FLD(field_flags,        0),
237
 
         STRUCT_FLD(old_name,           ""),
238
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
 
223
        FieldInfo("trx_started",
 
224
                  0,
 
225
                  DRIZZLE_TYPE_DATETIME,
 
226
                  0,
 
227
                  0,
 
228
                  "",
 
229
                  SKIP_OPEN_TABLE),
239
230
 
240
231
#define IDX_TRX_REQUESTED_LOCK_ID       3
241
 
        {STRUCT_FLD(field_name,         "trx_requested_lock_id"),
242
 
         STRUCT_FLD(field_length,       TRX_I_S_LOCK_ID_MAX_LEN + 1),
243
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_VARCHAR),
244
 
         STRUCT_FLD(value,              0),
245
 
         STRUCT_FLD(field_flags,        MY_I_S_MAYBE_NULL),
246
 
         STRUCT_FLD(old_name,           ""),
247
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
 
232
        FieldInfo("trx_requested_lock_id",
 
233
                  TRX_I_S_LOCK_ID_MAX_LEN + 1,
 
234
                  DRIZZLE_TYPE_VARCHAR,
 
235
                  0,
 
236
                  MY_I_S_MAYBE_NULL,
 
237
                  "",
 
238
                  SKIP_OPEN_TABLE),
248
239
 
249
240
#define IDX_TRX_WAIT_STARTED    4
250
 
        {STRUCT_FLD(field_name,         "trx_wait_started"),
251
 
         STRUCT_FLD(field_length,       0),
252
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_DATETIME),
253
 
         STRUCT_FLD(value,              0),
254
 
         STRUCT_FLD(field_flags,        MY_I_S_MAYBE_NULL),
255
 
         STRUCT_FLD(old_name,           ""),
256
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
 
241
        FieldInfo("trx_wait_started",
 
242
                  0,
 
243
                  DRIZZLE_TYPE_DATETIME,
 
244
                  0,
 
245
                  MY_I_S_MAYBE_NULL,
 
246
                  "",
 
247
                  SKIP_OPEN_TABLE),
257
248
 
258
249
#define IDX_TRX_WEIGHT          5
259
 
        {STRUCT_FLD(field_name,         "trx_weight"),
260
 
         STRUCT_FLD(field_length,       MY_INT64_NUM_DECIMAL_DIGITS),
261
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_LONGLONG),
262
 
         STRUCT_FLD(value,              0),
263
 
         STRUCT_FLD(field_flags,        MY_I_S_UNSIGNED),
264
 
         STRUCT_FLD(old_name,           ""),
265
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
 
250
        FieldInfo("trx_weight",
 
251
                  MY_INT64_NUM_DECIMAL_DIGITS,
 
252
                  DRIZZLE_TYPE_LONGLONG,
 
253
                  0,
 
254
                  MY_I_S_UNSIGNED,
 
255
                  "",
 
256
                  SKIP_OPEN_TABLE),
266
257
 
267
258
#define IDX_TRX_DRIZZLE_THREAD_ID       6
268
 
        {STRUCT_FLD(field_name,         "trx_mysql_thread_id"),
269
 
         STRUCT_FLD(field_length,       MY_INT64_NUM_DECIMAL_DIGITS),
270
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_LONGLONG),
271
 
         STRUCT_FLD(value,              0),
272
 
         STRUCT_FLD(field_flags,        MY_I_S_UNSIGNED),
273
 
         STRUCT_FLD(old_name,           ""),
274
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
 
259
        FieldInfo("trx_mysql_thread_id",
 
260
                  MY_INT64_NUM_DECIMAL_DIGITS,
 
261
                  DRIZZLE_TYPE_LONGLONG,
 
262
                  0,
 
263
                  MY_I_S_UNSIGNED,
 
264
                  "",
 
265
                  SKIP_OPEN_TABLE),
275
266
 
276
267
#define IDX_TRX_QUERY           7
277
 
        {STRUCT_FLD(field_name,         "trx_query"),
278
 
         STRUCT_FLD(field_length,       TRX_I_S_TRX_QUERY_MAX_LEN),
279
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_VARCHAR),
280
 
         STRUCT_FLD(value,              0),
281
 
         STRUCT_FLD(field_flags,        MY_I_S_MAYBE_NULL),
282
 
         STRUCT_FLD(old_name,           ""),
283
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
 
268
        FieldInfo("trx_query",
 
269
                  TRX_I_S_TRX_QUERY_MAX_LEN,
 
270
                  DRIZZLE_TYPE_VARCHAR,
 
271
                  0,
 
272
                  MY_I_S_MAYBE_NULL,
 
273
                  "",
 
274
                  SKIP_OPEN_TABLE),
284
275
 
285
 
        END_OF_ST_FIELD_INFO
 
276
        FieldInfo()
286
277
};
287
278
 
288
279
/***********************************************************************
389
380
 
390
381
 
391
382
/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_locks */
392
 
static ST_FIELD_INFO    innodb_locks_fields_info[] =
 
383
static FieldInfo innodb_locks_fields_info[] =
393
384
{
394
385
#define IDX_LOCK_ID             0
395
 
        {STRUCT_FLD(field_name,         "lock_id"),
396
 
         STRUCT_FLD(field_length,       TRX_I_S_LOCK_ID_MAX_LEN + 1),
397
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_VARCHAR),
398
 
         STRUCT_FLD(value,              0),
399
 
         STRUCT_FLD(field_flags,        0),
400
 
         STRUCT_FLD(old_name,           ""),
401
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
 
386
        FieldInfo("lock_id",
 
387
                  TRX_I_S_LOCK_ID_MAX_LEN + 1,
 
388
                  DRIZZLE_TYPE_VARCHAR,
 
389
                  0,
 
390
                  0,
 
391
                  "",
 
392
                  SKIP_OPEN_TABLE),
402
393
 
403
394
#define IDX_LOCK_TRX_ID         1
404
 
        {STRUCT_FLD(field_name,         "lock_trx_id"),
405
 
         STRUCT_FLD(field_length,       TRX_ID_MAX_LEN + 1),
406
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_VARCHAR),
407
 
         STRUCT_FLD(value,              0),
408
 
         STRUCT_FLD(field_flags,        0),
409
 
         STRUCT_FLD(old_name,           ""),
410
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
 
395
        FieldInfo("lock_trx_id",
 
396
                  TRX_ID_MAX_LEN + 1,
 
397
                  DRIZZLE_TYPE_VARCHAR,
 
398
                  0,
 
399
                  0,
 
400
                  "",
 
401
                  SKIP_OPEN_TABLE),
411
402
 
412
403
#define IDX_LOCK_MODE           2
413
 
        {STRUCT_FLD(field_name,         "lock_mode"),
 
404
        FieldInfo("lock_mode",
414
405
         /* S[,GAP] X[,GAP] IS[,GAP] IX[,GAP] AUTO_INC UNKNOWN */
415
 
         STRUCT_FLD(field_length,       32),
416
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_VARCHAR),
417
 
         STRUCT_FLD(value,              0),
418
 
         STRUCT_FLD(field_flags,        0),
419
 
         STRUCT_FLD(old_name,           ""),
420
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
 
406
                  32,
 
407
                  DRIZZLE_TYPE_VARCHAR,
 
408
                  0,
 
409
                  0,
 
410
                  "",
 
411
                  SKIP_OPEN_TABLE),
421
412
 
422
413
#define IDX_LOCK_TYPE           3
423
 
        {STRUCT_FLD(field_name,         "lock_type"),
424
 
         STRUCT_FLD(field_length,       32 /* RECORD|TABLE|UNKNOWN */),
425
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_VARCHAR),
426
 
         STRUCT_FLD(value,              0),
427
 
         STRUCT_FLD(field_flags,        0),
428
 
         STRUCT_FLD(old_name,           ""),
429
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
 
414
        FieldInfo("lock_type",
 
415
                  32, /* RECORD|TABLE|UNKNOWN */
 
416
                  DRIZZLE_TYPE_VARCHAR,
 
417
                  0,
 
418
                  0,
 
419
                  "",
 
420
                  SKIP_OPEN_TABLE),
430
421
 
431
422
#define IDX_LOCK_TABLE          4
432
 
        {STRUCT_FLD(field_name,         "lock_table"),
433
 
         STRUCT_FLD(field_length,       1024),
434
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_VARCHAR),
435
 
         STRUCT_FLD(value,              0),
436
 
         STRUCT_FLD(field_flags,        0),
437
 
         STRUCT_FLD(old_name,           ""),
438
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
 
423
        FieldInfo("lock_table",
 
424
                  1024,
 
425
                  DRIZZLE_TYPE_VARCHAR,
 
426
                  0,
 
427
                  0,
 
428
                  "",
 
429
                  SKIP_OPEN_TABLE),
439
430
 
440
431
#define IDX_LOCK_INDEX          5
441
 
        {STRUCT_FLD(field_name,         "lock_index"),
442
 
         STRUCT_FLD(field_length,       1024),
443
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_VARCHAR),
444
 
         STRUCT_FLD(value,              0),
445
 
         STRUCT_FLD(field_flags,        MY_I_S_MAYBE_NULL),
446
 
         STRUCT_FLD(old_name,           ""),
447
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
 
432
        FieldInfo("lock_index",
 
433
                  1024,
 
434
                  DRIZZLE_TYPE_VARCHAR,
 
435
                  0,
 
436
                  MY_I_S_MAYBE_NULL,
 
437
                  "",
 
438
                  SKIP_OPEN_TABLE),
448
439
 
449
440
#define IDX_LOCK_SPACE          6
450
 
        {STRUCT_FLD(field_name,         "lock_space"),
451
 
         STRUCT_FLD(field_length,       MY_INT64_NUM_DECIMAL_DIGITS),
452
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_LONGLONG),
453
 
         STRUCT_FLD(value,              0),
454
 
         STRUCT_FLD(field_flags,        MY_I_S_UNSIGNED | MY_I_S_MAYBE_NULL),
455
 
         STRUCT_FLD(old_name,           ""),
456
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
 
441
        FieldInfo("lock_space",
 
442
                  MY_INT64_NUM_DECIMAL_DIGITS,
 
443
                  DRIZZLE_TYPE_LONGLONG,
 
444
                  0,
 
445
                  MY_I_S_UNSIGNED | MY_I_S_MAYBE_NULL,
 
446
                  "",
 
447
                  SKIP_OPEN_TABLE),
457
448
 
458
449
#define IDX_LOCK_PAGE           7
459
 
        {STRUCT_FLD(field_name,         "lock_page"),
460
 
         STRUCT_FLD(field_length,       MY_INT64_NUM_DECIMAL_DIGITS),
461
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_LONGLONG),
462
 
         STRUCT_FLD(value,              0),
463
 
         STRUCT_FLD(field_flags,        MY_I_S_UNSIGNED | MY_I_S_MAYBE_NULL),
464
 
         STRUCT_FLD(old_name,           ""),
465
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
 
450
        FieldInfo("lock_page",
 
451
                  MY_INT64_NUM_DECIMAL_DIGITS,
 
452
                  DRIZZLE_TYPE_LONGLONG,
 
453
                  0,
 
454
                  MY_I_S_UNSIGNED | MY_I_S_MAYBE_NULL,
 
455
                  "",
 
456
                  SKIP_OPEN_TABLE),
466
457
 
467
458
#define IDX_LOCK_REC            8
468
 
        {STRUCT_FLD(field_name,         "lock_rec"),
469
 
         STRUCT_FLD(field_length,       MY_INT64_NUM_DECIMAL_DIGITS),
470
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_LONGLONG),
471
 
         STRUCT_FLD(value,              0),
472
 
         STRUCT_FLD(field_flags,        MY_I_S_UNSIGNED | MY_I_S_MAYBE_NULL),
473
 
         STRUCT_FLD(old_name,           ""),
474
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
 
459
        FieldInfo("lock_rec",
 
460
                  MY_INT64_NUM_DECIMAL_DIGITS,
 
461
                  DRIZZLE_TYPE_LONGLONG,
 
462
                  0,
 
463
                  MY_I_S_UNSIGNED | MY_I_S_MAYBE_NULL,
 
464
                  "",
 
465
                  SKIP_OPEN_TABLE),
475
466
 
476
467
#define IDX_LOCK_DATA           9
477
 
        {STRUCT_FLD(field_name,         "lock_data"),
478
 
         STRUCT_FLD(field_length,       TRX_I_S_LOCK_DATA_MAX_LEN),
479
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_VARCHAR),
480
 
         STRUCT_FLD(value,              0),
481
 
         STRUCT_FLD(field_flags,        MY_I_S_MAYBE_NULL),
482
 
         STRUCT_FLD(old_name,           ""),
483
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
 
468
        FieldInfo("lock_data",
 
469
                  TRX_I_S_LOCK_DATA_MAX_LEN,
 
470
                  DRIZZLE_TYPE_VARCHAR,
 
471
                  0,
 
472
                  MY_I_S_MAYBE_NULL,
 
473
                  "",
 
474
                  SKIP_OPEN_TABLE),
484
475
 
485
 
        END_OF_ST_FIELD_INFO
 
476
        FieldInfo()
486
477
};
487
478
 
488
479
/***********************************************************************
612
603
 
613
604
 
614
605
/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_lock_waits */
615
 
static ST_FIELD_INFO    innodb_lock_waits_fields_info[] =
 
606
static FieldInfo innodb_lock_waits_fields_info[] =
616
607
{
617
608
#define IDX_REQUESTING_TRX_ID   0
618
 
        {STRUCT_FLD(field_name,         "requesting_trx_id"),
619
 
         STRUCT_FLD(field_length,       TRX_ID_MAX_LEN + 1),
620
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_VARCHAR),
621
 
         STRUCT_FLD(value,              0),
622
 
         STRUCT_FLD(field_flags,        0),
623
 
         STRUCT_FLD(old_name,           ""),
624
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
 
609
        FieldInfo("requesting_trx_id",
 
610
                  TRX_ID_MAX_LEN + 1,
 
611
                  DRIZZLE_TYPE_VARCHAR,
 
612
                  0,
 
613
                  0,
 
614
                  "",
 
615
                  SKIP_OPEN_TABLE),
625
616
 
626
617
#define IDX_REQUESTED_LOCK_ID   1
627
 
        {STRUCT_FLD(field_name,         "requested_lock_id"),
628
 
         STRUCT_FLD(field_length,       TRX_I_S_LOCK_ID_MAX_LEN + 1),
629
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_VARCHAR),
630
 
         STRUCT_FLD(value,              0),
631
 
         STRUCT_FLD(field_flags,        0),
632
 
         STRUCT_FLD(old_name,           ""),
633
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
 
618
        FieldInfo("requested_lock_id",
 
619
                  TRX_I_S_LOCK_ID_MAX_LEN + 1,
 
620
                  DRIZZLE_TYPE_VARCHAR,
 
621
                  0,
 
622
                  0,
 
623
                  "",
 
624
                  SKIP_OPEN_TABLE),
634
625
 
635
626
#define IDX_BLOCKING_TRX_ID     2
636
 
        {STRUCT_FLD(field_name,         "blocking_trx_id"),
637
 
         STRUCT_FLD(field_length,       TRX_ID_MAX_LEN + 1),
638
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_VARCHAR),
639
 
         STRUCT_FLD(value,              0),
640
 
         STRUCT_FLD(field_flags,        0),
641
 
         STRUCT_FLD(old_name,           ""),
642
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
 
627
        FieldInfo("blocking_trx_id",
 
628
                  TRX_ID_MAX_LEN + 1,
 
629
                  DRIZZLE_TYPE_VARCHAR,
 
630
                  0,
 
631
                  0,
 
632
                  "",
 
633
                  SKIP_OPEN_TABLE),
643
634
 
644
635
#define IDX_BLOCKING_LOCK_ID    3
645
 
        {STRUCT_FLD(field_name,         "blocking_lock_id"),
646
 
         STRUCT_FLD(field_length,       TRX_I_S_LOCK_ID_MAX_LEN + 1),
647
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_VARCHAR),
648
 
         STRUCT_FLD(value,              0),
649
 
         STRUCT_FLD(field_flags,        0),
650
 
         STRUCT_FLD(old_name,           ""),
651
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
 
636
        FieldInfo("blocking_lock_id",
 
637
                  TRX_I_S_LOCK_ID_MAX_LEN + 1,
 
638
                  DRIZZLE_TYPE_VARCHAR,
 
639
                  0,
 
640
                  0,
 
641
                  "",
 
642
                  SKIP_OPEN_TABLE),
652
643
 
653
 
        END_OF_ST_FIELD_INFO
 
644
        FieldInfo()
654
645
};
655
646
 
656
647
/***********************************************************************
839
830
}
840
831
 
841
832
/* Fields of the dynamic table information_schema.innodb_cmp. */
842
 
static ST_FIELD_INFO    i_s_cmp_fields_info[] =
 
833
static FieldInfo        i_s_cmp_fields_info[] =
843
834
{
844
 
        {STRUCT_FLD(field_name,         "page_size"),
845
 
         STRUCT_FLD(field_length,       5),
846
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_LONG),
847
 
         STRUCT_FLD(value,              0),
848
 
         STRUCT_FLD(field_flags,        0),
849
 
         STRUCT_FLD(old_name,           "Compressed Page Size"),
850
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
851
 
 
852
 
        {STRUCT_FLD(field_name,         "compress_ops"),
853
 
         STRUCT_FLD(field_length,       MY_INT32_NUM_DECIMAL_DIGITS),
854
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_LONG),
855
 
         STRUCT_FLD(value,              0),
856
 
         STRUCT_FLD(field_flags,        0),
857
 
         STRUCT_FLD(old_name,           "Total Number of Compressions"),
858
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
859
 
 
860
 
        {STRUCT_FLD(field_name,         "compress_ops_ok"),
861
 
         STRUCT_FLD(field_length,       MY_INT32_NUM_DECIMAL_DIGITS),
862
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_LONG),
863
 
         STRUCT_FLD(value,              0),
864
 
         STRUCT_FLD(field_flags,        0),
865
 
         STRUCT_FLD(old_name,           "Total Number of"
866
 
                                        " Successful Compressions"),
867
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
868
 
 
869
 
        {STRUCT_FLD(field_name,         "compress_time"),
870
 
         STRUCT_FLD(field_length,       MY_INT32_NUM_DECIMAL_DIGITS),
871
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_LONG),
872
 
         STRUCT_FLD(value,              0),
873
 
         STRUCT_FLD(field_flags,        0),
874
 
         STRUCT_FLD(old_name,           "Total Duration of Compressions,"
875
 
                    " in Seconds"),
876
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
877
 
 
878
 
        {STRUCT_FLD(field_name,         "uncompress_ops"),
879
 
         STRUCT_FLD(field_length,       MY_INT32_NUM_DECIMAL_DIGITS),
880
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_LONG),
881
 
         STRUCT_FLD(value,              0),
882
 
         STRUCT_FLD(field_flags,        0),
883
 
         STRUCT_FLD(old_name,           "Total Number of Decompressions"),
884
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
885
 
 
886
 
        {STRUCT_FLD(field_name,         "uncompress_time"),
887
 
         STRUCT_FLD(field_length,       MY_INT32_NUM_DECIMAL_DIGITS),
888
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_LONG),
889
 
         STRUCT_FLD(value,              0),
890
 
         STRUCT_FLD(field_flags,        0),
891
 
         STRUCT_FLD(old_name,           "Total Duration of Decompressions,"
892
 
                    " in Seconds"),
893
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
894
 
 
895
 
        END_OF_ST_FIELD_INFO
 
835
        FieldInfo("page_size",
 
836
                  5,
 
837
                  DRIZZLE_TYPE_LONG,
 
838
                  0,
 
839
                  0,
 
840
                  "Compressed Page Size",
 
841
                  SKIP_OPEN_TABLE),
 
842
 
 
843
        FieldInfo("compress_ops",
 
844
                  MY_INT32_NUM_DECIMAL_DIGITS,
 
845
                  DRIZZLE_TYPE_LONG,
 
846
                  0,
 
847
                  0,
 
848
                  "Total Number of Compressions",
 
849
                  SKIP_OPEN_TABLE),
 
850
 
 
851
        FieldInfo("compress_ops_ok",
 
852
                  MY_INT32_NUM_DECIMAL_DIGITS,
 
853
                  DRIZZLE_TYPE_LONG,
 
854
                  0,
 
855
                  0,
 
856
                  "Total Number of Successful Compressions",
 
857
                  SKIP_OPEN_TABLE),
 
858
 
 
859
        FieldInfo("compress_time",
 
860
                  MY_INT32_NUM_DECIMAL_DIGITS,
 
861
                  DRIZZLE_TYPE_LONG,
 
862
                  0,
 
863
                  0,
 
864
                  "Total Duration of Compressions in Seconds",
 
865
                  SKIP_OPEN_TABLE),
 
866
 
 
867
        FieldInfo("uncompress_ops",
 
868
                  MY_INT32_NUM_DECIMAL_DIGITS,
 
869
                  DRIZZLE_TYPE_LONG,
 
870
                  0,
 
871
                  0,
 
872
                  "Total Number of Decompressions",
 
873
                  SKIP_OPEN_TABLE),
 
874
 
 
875
        FieldInfo("uncompress_time",
 
876
                  MY_INT32_NUM_DECIMAL_DIGITS,
 
877
                  DRIZZLE_TYPE_LONG,
 
878
                  0,
 
879
                  0,
 
880
                  "Total Duration of Decompressions in Seconds",
 
881
                  SKIP_OPEN_TABLE),
 
882
 
 
883
        FieldInfo()
896
884
};
897
885
 
898
886
 
1018
1006
 
1019
1007
 
1020
1008
/* Fields of the dynamic table information_schema.innodb_cmpmem. */
1021
 
static ST_FIELD_INFO    i_s_cmpmem_fields_info[] =
 
1009
static FieldInfo        i_s_cmpmem_fields_info[] =
1022
1010
{
1023
 
        {STRUCT_FLD(field_name,         "page_size"),
1024
 
         STRUCT_FLD(field_length,       5),
1025
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_LONG),
1026
 
         STRUCT_FLD(value,              0),
1027
 
         STRUCT_FLD(field_flags,        0),
1028
 
         STRUCT_FLD(old_name,           "Buddy Block Size"),
1029
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
1030
 
 
1031
 
        {STRUCT_FLD(field_name,         "pages_used"),
1032
 
         STRUCT_FLD(field_length,       MY_INT32_NUM_DECIMAL_DIGITS),
1033
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_LONG),
1034
 
         STRUCT_FLD(value,              0),
1035
 
         STRUCT_FLD(field_flags,        0),
1036
 
         STRUCT_FLD(old_name,           "Currently in Use"),
1037
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
1038
 
 
1039
 
        {STRUCT_FLD(field_name,         "pages_free"),
1040
 
         STRUCT_FLD(field_length,       MY_INT32_NUM_DECIMAL_DIGITS),
1041
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_LONG),
1042
 
         STRUCT_FLD(value,              0),
1043
 
         STRUCT_FLD(field_flags,        0),
1044
 
         STRUCT_FLD(old_name,           "Currently Available"),
1045
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
1046
 
 
1047
 
        {STRUCT_FLD(field_name,         "relocation_ops"),
1048
 
         STRUCT_FLD(field_length,       MY_INT64_NUM_DECIMAL_DIGITS),
1049
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_LONGLONG),
1050
 
         STRUCT_FLD(value,              0),
1051
 
         STRUCT_FLD(field_flags,        0),
1052
 
         STRUCT_FLD(old_name,           "Total Number of Relocations"),
1053
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
1054
 
 
1055
 
        {STRUCT_FLD(field_name,         "relocation_time"),
1056
 
         STRUCT_FLD(field_length,       MY_INT32_NUM_DECIMAL_DIGITS),
1057
 
         STRUCT_FLD(field_type,         DRIZZLE_TYPE_LONG),
1058
 
         STRUCT_FLD(value,              0),
1059
 
         STRUCT_FLD(field_flags,        0),
1060
 
         STRUCT_FLD(old_name,           "Total Duration of Relocations,"
1061
 
                    " in Seconds"),
1062
 
         STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
1063
 
 
1064
 
        END_OF_ST_FIELD_INFO
 
1011
        FieldInfo("page_size",
 
1012
                  5,
 
1013
                  DRIZZLE_TYPE_LONG,
 
1014
                  0,
 
1015
                  0,
 
1016
                  "Buddy Block Size",
 
1017
                  SKIP_OPEN_TABLE),
 
1018
 
 
1019
        FieldInfo("pages_used",
 
1020
                  MY_INT32_NUM_DECIMAL_DIGITS,
 
1021
                  DRIZZLE_TYPE_LONG,
 
1022
                  0,
 
1023
                  0,
 
1024
                  "Currently in Use",
 
1025
                  SKIP_OPEN_TABLE),
 
1026
 
 
1027
        FieldInfo("pages_free",
 
1028
                  MY_INT32_NUM_DECIMAL_DIGITS,
 
1029
                  DRIZZLE_TYPE_LONG,
 
1030
                  0,
 
1031
                  0,
 
1032
                  "Currently Available",
 
1033
                  SKIP_OPEN_TABLE),
 
1034
 
 
1035
        FieldInfo("relocation_ops",
 
1036
                  MY_INT64_NUM_DECIMAL_DIGITS,
 
1037
                  DRIZZLE_TYPE_LONGLONG,
 
1038
                  0,
 
1039
                  0,
 
1040
                  "Total Number of Relocations",
 
1041
                  SKIP_OPEN_TABLE),
 
1042
 
 
1043
        FieldInfo("relocation_time",
 
1044
                  MY_INT32_NUM_DECIMAL_DIGITS,
 
1045
                  DRIZZLE_TYPE_LONG,
 
1046
                  0,
 
1047
                  0,
 
1048
                  "Total Duration of Relocations, in Seconds",
 
1049
                  SKIP_OPEN_TABLE),
 
1050
 
 
1051
        FieldInfo()
1065
1052
};
1066
1053
 
1067
1054
/***********************************************************************