Skip to content

M
mariadb
Commit 354a9fc0 authored by marko's avatar marko
Browse files
Options

branches/zip: Initialize also the newly added field open_method 

in ST_FIELD_INFO.
parent f591eb0b
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 27 deletions
handler/ha_innodb.cc
View file @ 354a9fc0
...@@ -8042,16 +8042,17 @@ innobase_stat_zip_reset_fill( ...@@ -8042,16 +8042,17 @@ innobase_stat_zip_reset_fill(
/* Fields of the dynamic table information_schema.innodb_zip. */ /* Fields of the dynamic table information_schema.innodb_zip. */
static ST_FIELD_INFO innobase_stat_zip_fields[] = static ST_FIELD_INFO innobase_stat_zip_fields[] =
{ {
{"SIZE", 5, MYSQL_TYPE_LONG, 0, 0, "Block Size"}, {"SIZE", 5, MYSQL_TYPE_LONG, 0, 0, "Block Size", SKIP_OPEN_TABLE},
{"RELOCATED", 21, MYSQL_TYPE_LONG, 0, 0, "Total Number of Relocations"}, {"RELOCATED", 21, MYSQL_TYPE_LONG, 0, 0,
"Total Number of Relocations", SKIP_OPEN_TABLE},
{"COMPRESSED", 21, MYSQL_TYPE_LONG, 0, 0, {"COMPRESSED", 21, MYSQL_TYPE_LONG, 0, 0,
"Total Number of Compressions"}, "Total Number of Compressions", SKIP_OPEN_TABLE},
{"COMPRESSED_OK", 21, MYSQL_TYPE_LONG, 0, 0, {"COMPRESSED_OK", 21, MYSQL_TYPE_LONG, 0, 0,
"Total Number of Successful Compressions"}, "Total Number of Successful Compressions", SKIP_OPEN_TABLE},
{"DECOMPRESSED", 21, MYSQL_TYPE_LONG, 0, 0, {"DECOMPRESSED", 21, MYSQL_TYPE_LONG, 0, 0,
"Total Number of Decompressions"}, "Total Number of Decompressions", SKIP_OPEN_TABLE},
{"USED", 21, MYSQL_TYPE_LONG, 0, 0, "Currently in Use"}, {"USED", 21, MYSQL_TYPE_LONG, 0, 0, "Currently in Use", SKIP_OPEN_TABLE},
{0, 0, MYSQL_TYPE_STRING, 0, 0, 0} {0, 0, MYSQL_TYPE_STRING, 0, 0, 0, SKIP_OPEN_TABLE}
}; };
/*********************************************************************** /***********************************************************************
......
handler/i_s.cc
View file @ 354a9fc0
...@@ -179,7 +179,8 @@ static ST_FIELD_INFO innodb_trx_fields_info[] = ...@@ -179,7 +179,8 @@ static ST_FIELD_INFO innodb_trx_fields_info[] =
STRUCT_FLD(field_type, MYSQL_TYPE_LONGLONG), STRUCT_FLD(field_type, MYSQL_TYPE_LONGLONG),
STRUCT_FLD(value, 0), STRUCT_FLD(value, 0),
STRUCT_FLD(field_flags, MY_I_S_UNSIGNED), STRUCT_FLD(field_flags, MY_I_S_UNSIGNED),
STRUCT_FLD(old_name, "")}, STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
#define IDX_TRX_STATE 1 #define IDX_TRX_STATE 1
{STRUCT_FLD(field_name, "trx_state"), {STRUCT_FLD(field_name, "trx_state"),
...@@ -187,7 +188,8 @@ static ST_FIELD_INFO innodb_trx_fields_info[] = ...@@ -187,7 +188,8 @@ static ST_FIELD_INFO innodb_trx_fields_info[] =
STRUCT_FLD(field_type, MYSQL_TYPE_STRING), STRUCT_FLD(field_type, MYSQL_TYPE_STRING),
STRUCT_FLD(value, 0), STRUCT_FLD(value, 0),
STRUCT_FLD(field_flags, 0), STRUCT_FLD(field_flags, 0),
STRUCT_FLD(old_name, "")}, STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
#define IDX_TRX_STARTED 2 #define IDX_TRX_STARTED 2
{STRUCT_FLD(field_name, "trx_started"), {STRUCT_FLD(field_name, "trx_started"),
...@@ -195,7 +197,8 @@ static ST_FIELD_INFO innodb_trx_fields_info[] = ...@@ -195,7 +197,8 @@ static ST_FIELD_INFO innodb_trx_fields_info[] =
STRUCT_FLD(field_type, MYSQL_TYPE_DATETIME), STRUCT_FLD(field_type, MYSQL_TYPE_DATETIME),
STRUCT_FLD(value, 0), STRUCT_FLD(value, 0),
STRUCT_FLD(field_flags, 0), STRUCT_FLD(field_flags, 0),
STRUCT_FLD(old_name, "")}, STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
#define IDX_TRX_WAIT_LOCK_ID 3 #define IDX_TRX_WAIT_LOCK_ID 3
{STRUCT_FLD(field_name, "trx_wait_lock_id"), {STRUCT_FLD(field_name, "trx_wait_lock_id"),
...@@ -203,7 +206,8 @@ static ST_FIELD_INFO innodb_trx_fields_info[] = ...@@ -203,7 +206,8 @@ static ST_FIELD_INFO innodb_trx_fields_info[] =
STRUCT_FLD(field_type, MYSQL_TYPE_STRING), STRUCT_FLD(field_type, MYSQL_TYPE_STRING),
STRUCT_FLD(value, 0), STRUCT_FLD(value, 0),
STRUCT_FLD(field_flags, MY_I_S_MAYBE_NULL), STRUCT_FLD(field_flags, MY_I_S_MAYBE_NULL),
STRUCT_FLD(old_name, "")}, STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
#define IDX_TRX_WAIT_STARTED 4 #define IDX_TRX_WAIT_STARTED 4
{STRUCT_FLD(field_name, "trx_wait_started"), {STRUCT_FLD(field_name, "trx_wait_started"),
...@@ -211,7 +215,8 @@ static ST_FIELD_INFO innodb_trx_fields_info[] = ...@@ -211,7 +215,8 @@ static ST_FIELD_INFO innodb_trx_fields_info[] =
STRUCT_FLD(field_type, MYSQL_TYPE_DATETIME), STRUCT_FLD(field_type, MYSQL_TYPE_DATETIME),
STRUCT_FLD(value, 0), STRUCT_FLD(value, 0),
STRUCT_FLD(field_flags, MY_I_S_MAYBE_NULL), STRUCT_FLD(field_flags, MY_I_S_MAYBE_NULL),
STRUCT_FLD(old_name, "")}, STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
#define IDX_TRX_MYSQL_THREAD_ID 5 #define IDX_TRX_MYSQL_THREAD_ID 5
{STRUCT_FLD(field_name, "trx_mysql_thread_id"), {STRUCT_FLD(field_name, "trx_mysql_thread_id"),
...@@ -219,14 +224,16 @@ static ST_FIELD_INFO innodb_trx_fields_info[] = ...@@ -219,14 +224,16 @@ static ST_FIELD_INFO innodb_trx_fields_info[] =
STRUCT_FLD(field_type, MYSQL_TYPE_LONGLONG), STRUCT_FLD(field_type, MYSQL_TYPE_LONGLONG),
STRUCT_FLD(value, 0), STRUCT_FLD(value, 0),
STRUCT_FLD(field_flags, MY_I_S_UNSIGNED), STRUCT_FLD(field_flags, MY_I_S_UNSIGNED),
STRUCT_FLD(old_name, "")}, STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
{STRUCT_FLD(field_name, NULL), {STRUCT_FLD(field_name, NULL),
STRUCT_FLD(field_length, 0), STRUCT_FLD(field_length, 0),
STRUCT_FLD(field_type, MYSQL_TYPE_NULL), STRUCT_FLD(field_type, MYSQL_TYPE_NULL),
STRUCT_FLD(value, 0), STRUCT_FLD(value, 0),
STRUCT_FLD(field_flags, 0), STRUCT_FLD(field_flags, 0),
STRUCT_FLD(old_name, "")} STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}
}; };
/*********************************************************************** /***********************************************************************
...@@ -388,7 +395,8 @@ static ST_FIELD_INFO innodb_locks_fields_info[] = ...@@ -388,7 +395,8 @@ static ST_FIELD_INFO innodb_locks_fields_info[] =
STRUCT_FLD(field_type, MYSQL_TYPE_STRING), STRUCT_FLD(field_type, MYSQL_TYPE_STRING),
STRUCT_FLD(value, 0), STRUCT_FLD(value, 0),
STRUCT_FLD(field_flags, 0), STRUCT_FLD(field_flags, 0),
STRUCT_FLD(old_name, "")}, STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
#define IDX_LOCK_TRX_ID 1 #define IDX_LOCK_TRX_ID 1
{STRUCT_FLD(field_name, "lock_trx_id"), {STRUCT_FLD(field_name, "lock_trx_id"),
...@@ -396,7 +404,8 @@ static ST_FIELD_INFO innodb_locks_fields_info[] = ...@@ -396,7 +404,8 @@ static ST_FIELD_INFO innodb_locks_fields_info[] =
STRUCT_FLD(field_type, MYSQL_TYPE_LONGLONG), STRUCT_FLD(field_type, MYSQL_TYPE_LONGLONG),
STRUCT_FLD(value, 0), STRUCT_FLD(value, 0),
STRUCT_FLD(field_flags, MY_I_S_UNSIGNED), STRUCT_FLD(field_flags, MY_I_S_UNSIGNED),
STRUCT_FLD(old_name, "")}, STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
#define IDX_LOCK_MODE 2 #define IDX_LOCK_MODE 2
{STRUCT_FLD(field_name, "lock_mode"), {STRUCT_FLD(field_name, "lock_mode"),
...@@ -404,7 +413,8 @@ static ST_FIELD_INFO innodb_locks_fields_info[] = ...@@ -404,7 +413,8 @@ static ST_FIELD_INFO innodb_locks_fields_info[] =
STRUCT_FLD(field_type, MYSQL_TYPE_STRING), STRUCT_FLD(field_type, MYSQL_TYPE_STRING),
STRUCT_FLD(value, 0), STRUCT_FLD(value, 0),
STRUCT_FLD(field_flags, 0), STRUCT_FLD(field_flags, 0),
STRUCT_FLD(old_name, "")}, STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
#define IDX_LOCK_TYPE 3 #define IDX_LOCK_TYPE 3
{STRUCT_FLD(field_name, "lock_type"), {STRUCT_FLD(field_name, "lock_type"),
...@@ -412,7 +422,8 @@ static ST_FIELD_INFO innodb_locks_fields_info[] = ...@@ -412,7 +422,8 @@ static ST_FIELD_INFO innodb_locks_fields_info[] =
STRUCT_FLD(field_type, MYSQL_TYPE_STRING), STRUCT_FLD(field_type, MYSQL_TYPE_STRING),
STRUCT_FLD(value, 0), STRUCT_FLD(value, 0),
STRUCT_FLD(field_flags, 0), STRUCT_FLD(field_flags, 0),
STRUCT_FLD(old_name, "")}, STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
#define IDX_LOCK_TABLE 4 #define IDX_LOCK_TABLE 4
{STRUCT_FLD(field_name, "lock_table"), {STRUCT_FLD(field_name, "lock_table"),
...@@ -420,7 +431,8 @@ static ST_FIELD_INFO innodb_locks_fields_info[] = ...@@ -420,7 +431,8 @@ static ST_FIELD_INFO innodb_locks_fields_info[] =
STRUCT_FLD(field_type, MYSQL_TYPE_STRING), STRUCT_FLD(field_type, MYSQL_TYPE_STRING),
STRUCT_FLD(value, 0), STRUCT_FLD(value, 0),
STRUCT_FLD(field_flags, 0), STRUCT_FLD(field_flags, 0),
STRUCT_FLD(old_name, "")}, STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
#define IDX_LOCK_INDEX 5 #define IDX_LOCK_INDEX 5
{STRUCT_FLD(field_name, "lock_index"), {STRUCT_FLD(field_name, "lock_index"),
...@@ -428,7 +440,8 @@ static ST_FIELD_INFO innodb_locks_fields_info[] = ...@@ -428,7 +440,8 @@ static ST_FIELD_INFO innodb_locks_fields_info[] =
STRUCT_FLD(field_type, MYSQL_TYPE_STRING), STRUCT_FLD(field_type, MYSQL_TYPE_STRING),
STRUCT_FLD(value, 0), STRUCT_FLD(value, 0),
STRUCT_FLD(field_flags, MY_I_S_MAYBE_NULL), STRUCT_FLD(field_flags, MY_I_S_MAYBE_NULL),
STRUCT_FLD(old_name, "")}, STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
#define IDX_LOCK_SPACE 6 #define IDX_LOCK_SPACE 6
{STRUCT_FLD(field_name, "lock_space"), {STRUCT_FLD(field_name, "lock_space"),
...@@ -436,7 +449,8 @@ static ST_FIELD_INFO innodb_locks_fields_info[] = ...@@ -436,7 +449,8 @@ static ST_FIELD_INFO innodb_locks_fields_info[] =
STRUCT_FLD(field_type, MYSQL_TYPE_LONGLONG), STRUCT_FLD(field_type, MYSQL_TYPE_LONGLONG),
STRUCT_FLD(value, 0), STRUCT_FLD(value, 0),
STRUCT_FLD(field_flags, MY_I_S_UNSIGNED | MY_I_S_MAYBE_NULL), STRUCT_FLD(field_flags, MY_I_S_UNSIGNED | MY_I_S_MAYBE_NULL),
STRUCT_FLD(old_name, "")}, STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
#define IDX_LOCK_PAGE 7 #define IDX_LOCK_PAGE 7
{STRUCT_FLD(field_name, "lock_page"), {STRUCT_FLD(field_name, "lock_page"),
...@@ -444,7 +458,8 @@ static ST_FIELD_INFO innodb_locks_fields_info[] = ...@@ -444,7 +458,8 @@ static ST_FIELD_INFO innodb_locks_fields_info[] =
STRUCT_FLD(field_type, MYSQL_TYPE_LONGLONG), STRUCT_FLD(field_type, MYSQL_TYPE_LONGLONG),
STRUCT_FLD(value, 0), STRUCT_FLD(value, 0),
STRUCT_FLD(field_flags, MY_I_S_UNSIGNED | MY_I_S_MAYBE_NULL), STRUCT_FLD(field_flags, MY_I_S_UNSIGNED | MY_I_S_MAYBE_NULL),
STRUCT_FLD(old_name, "")}, STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
#define IDX_LOCK_REC 8 #define IDX_LOCK_REC 8
{STRUCT_FLD(field_name, "lock_rec"), {STRUCT_FLD(field_name, "lock_rec"),
...@@ -452,14 +467,16 @@ static ST_FIELD_INFO innodb_locks_fields_info[] = ...@@ -452,14 +467,16 @@ static ST_FIELD_INFO innodb_locks_fields_info[] =
STRUCT_FLD(field_type, MYSQL_TYPE_LONGLONG), STRUCT_FLD(field_type, MYSQL_TYPE_LONGLONG),
STRUCT_FLD(value, 0), STRUCT_FLD(value, 0),
STRUCT_FLD(field_flags, MY_I_S_UNSIGNED | MY_I_S_MAYBE_NULL), STRUCT_FLD(field_flags, MY_I_S_UNSIGNED | MY_I_S_MAYBE_NULL),
STRUCT_FLD(old_name, "")}, STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
{STRUCT_FLD(field_name, NULL), {STRUCT_FLD(field_name, NULL),
STRUCT_FLD(field_length, 0), STRUCT_FLD(field_length, 0),
STRUCT_FLD(field_type, MYSQL_TYPE_NULL), STRUCT_FLD(field_type, MYSQL_TYPE_NULL),
STRUCT_FLD(value, 0), STRUCT_FLD(value, 0),
STRUCT_FLD(field_flags, 0), STRUCT_FLD(field_flags, 0),
STRUCT_FLD(old_name, "")} STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}
}; };
/*********************************************************************** /***********************************************************************
...@@ -622,7 +639,8 @@ static ST_FIELD_INFO innodb_lock_waits_fields_info[] = ...@@ -622,7 +639,8 @@ static ST_FIELD_INFO innodb_lock_waits_fields_info[] =
STRUCT_FLD(field_type, MYSQL_TYPE_STRING), STRUCT_FLD(field_type, MYSQL_TYPE_STRING),
STRUCT_FLD(value, 0), STRUCT_FLD(value, 0),
STRUCT_FLD(field_flags, 0), STRUCT_FLD(field_flags, 0),
STRUCT_FLD(old_name, "")}, STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
#define IDX_WAITED_LOCK_ID 1 #define IDX_WAITED_LOCK_ID 1
{STRUCT_FLD(field_name, "waited_lock_id"), {STRUCT_FLD(field_name, "waited_lock_id"),
...@@ -630,14 +648,16 @@ static ST_FIELD_INFO innodb_lock_waits_fields_info[] = ...@@ -630,14 +648,16 @@ static ST_FIELD_INFO innodb_lock_waits_fields_info[] =
STRUCT_FLD(field_type, MYSQL_TYPE_STRING), STRUCT_FLD(field_type, MYSQL_TYPE_STRING),
STRUCT_FLD(value, 0), STRUCT_FLD(value, 0),
STRUCT_FLD(field_flags, 0), STRUCT_FLD(field_flags, 0),
STRUCT_FLD(old_name, "")}, STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
{STRUCT_FLD(field_name, NULL), {STRUCT_FLD(field_name, NULL),
STRUCT_FLD(field_length, 0), STRUCT_FLD(field_length, 0),
STRUCT_FLD(field_type, MYSQL_TYPE_NULL), STRUCT_FLD(field_type, MYSQL_TYPE_NULL),
STRUCT_FLD(value, 0), STRUCT_FLD(value, 0),
STRUCT_FLD(field_flags, 0), STRUCT_FLD(field_flags, 0),
STRUCT_FLD(old_name, "")} STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}
}; };
/*********************************************************************** /***********************************************************************
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7