Skip to content

Commit

Permalink
update XtraDB/InnoDB plugin maturity to match the server
Browse files Browse the repository at this point in the history 
because of encryption changes - make it beta and let
it mature together with the server
  • Loading branch information
@vuvova
vuvova committed Apr 9, 2015
1 parent 3a2ec3f commit d6b912c
Show file tree
Hide file tree
Showing 5 changed files with 70 additions and 70 deletions.
2 changes: 1 addition & 1 deletion storage/innobase/handler/ha_innodb.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19448,7 +19448,7 @@ maria_declare_plugin(innobase)
innodb_status_variables_export,/* status variables */
innobase_system_variables, /* system variables */
INNODB_VERSION_STR, /* string version */
MariaDB_PLUGIN_MATURITY_STABLE /* maturity */
MariaDB_PLUGIN_MATURITY_BETA /* maturity */
},
i_s_innodb_trx,
i_s_innodb_locks,
Expand Down
64 changes: 32 additions & 32 deletions storage/innobase/handler/i_s.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_trx =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
};

/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_locks */
Expand Down Expand Up @@ -1041,7 +1041,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_locks =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
};

/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_lock_waits */
Expand Down Expand Up @@ -1224,7 +1224,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_lock_waits =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
};

/*******************************************************************//**
Expand Down Expand Up @@ -1560,7 +1560,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_cmp =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
};

UNIV_INTERN struct st_maria_plugin i_s_innodb_cmp_reset =
Expand Down Expand Up @@ -1610,7 +1610,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_cmp_reset =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
};

/* Fields of the dynamic tables
Expand Down Expand Up @@ -1910,7 +1910,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_cmp_per_index =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
};

UNIV_INTERN struct st_maria_plugin i_s_innodb_cmp_per_index_reset =
Expand Down Expand Up @@ -1960,7 +1960,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_cmp_per_index_reset =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
};

/* Fields of the dynamic table information_schema.innodb_cmpmem. */
Expand Down Expand Up @@ -2203,7 +2203,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_cmpmem =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
};

UNIV_INTERN struct st_maria_plugin i_s_innodb_cmpmem_reset =
Expand Down Expand Up @@ -2253,7 +2253,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_cmpmem_reset =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
};

/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_metrics */
Expand Down Expand Up @@ -2777,7 +2777,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_metrics =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
};
/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_ft_default_stopword */
static ST_FIELD_INFO i_s_stopword_fields_info[] =
Expand Down Expand Up @@ -2890,7 +2890,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_ft_default_stopword =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
};

/* Fields of the dynamic table INFORMATION_SCHEMA.INNODB_FT_DELETED
Expand Down Expand Up @@ -3058,7 +3058,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_ft_deleted =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
};

/*******************************************************************//**
Expand Down Expand Up @@ -3141,7 +3141,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_ft_being_deleted =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
};

/* Fields of the dynamic table INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHED and
Expand Down Expand Up @@ -3431,7 +3431,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_ft_index_cache =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
};

/*******************************************************************//**
Expand Down Expand Up @@ -3866,7 +3866,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_ft_index_table =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
};

/* Fields of the dynamic table INFORMATION_SCHEMA.INNODB_FT_CONFIG */
Expand Down Expand Up @@ -4060,7 +4060,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_ft_config =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
};

/* Fields of the dynamic table INNODB_BUFFER_POOL_STATS. */
Expand Down Expand Up @@ -4609,7 +4609,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_buffer_stats =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
};

/* Fields of the dynamic table INNODB_BUFFER_POOL_PAGE. */
Expand Down Expand Up @@ -5321,7 +5321,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_buffer_page =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
};

static ST_FIELD_INFO i_s_innodb_buf_page_lru_fields_info[] =
Expand Down Expand Up @@ -5868,7 +5868,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_buffer_page_lru =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
};

/*******************************************************************//**
Expand Down Expand Up @@ -6162,7 +6162,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_sys_tables =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
};

/** SYS_TABLESTATS ***********************************************/
Expand Down Expand Up @@ -6452,7 +6452,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_sys_tablestats =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
};

/** SYS_INDEXES **************************************************/
Expand Down Expand Up @@ -6704,7 +6704,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_sys_indexes =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
};

/** SYS_COLUMNS **************************************************/
Expand Down Expand Up @@ -6941,7 +6941,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_sys_columns =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
};

/** SYS_FIELDS ***************************************************/
Expand Down Expand Up @@ -7151,7 +7151,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_sys_fields =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
};

/** SYS_FOREIGN ********************************************/
Expand Down Expand Up @@ -7376,7 +7376,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_sys_foreign =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
};

/** SYS_FOREIGN_COLS ********************************************/
Expand Down Expand Up @@ -7593,7 +7593,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_sys_foreign_cols =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
};

/** SYS_TABLESPACES ********************************************/
Expand Down Expand Up @@ -7861,7 +7861,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_sys_tablespaces =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
};

/** SYS_DATAFILES ************************************************/
Expand Down Expand Up @@ -8050,7 +8050,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_sys_datafiles =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
};

/** TABLESPACES_ENCRYPTION ********************************************/
Expand Down Expand Up @@ -8332,7 +8332,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_tablespaces_encryption =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE)
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA)
};

/** TABLESPACES_SCRUBBING ********************************************/
Expand Down Expand Up @@ -8630,7 +8630,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_tablespaces_scrubbing =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE)
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA)
};

/** INNODB_MUTEXES *********************************************/
Expand Down Expand Up @@ -8844,7 +8844,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_mutexes =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
};

/** SYS_SEMAPHORE_WAITS ************************************************/
Expand Down Expand Up @@ -9121,5 +9121,5 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_sys_semaphore_waits =

/* Maria extension */
STRUCT_FLD(version_info, INNODB_VERSION_STR),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE),
STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
};
2 changes: 1 addition & 1 deletion storage/xtradb/handler/ha_innodb.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20668,7 +20668,7 @@ maria_declare_plugin(xtradb)
innodb_status_variables_export,/* status variables */
innobase_system_variables, /* system variables */
INNODB_VERSION_STR, /* string version */
MariaDB_PLUGIN_MATURITY_STABLE /* maturity */
MariaDB_PLUGIN_MATURITY_BETA /* maturity */
},
i_s_xtradb_read_view,
i_s_xtradb_internal_hash_tables,
Expand Down
Loading

0 comments on commit d6b912c

Please sign in to comment.