diff options
Diffstat (limited to 'plugin/user_variables/user_variables.cc')
| -rw-r--r-- | plugin/user_variables/user_variables.cc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/plugin/user_variables/user_variables.cc b/plugin/user_variables/user_variables.cc index bee8b1feccc..f820e4ad890 100644 --- a/plugin/user_variables/user_variables.cc +++ b/plugin/user_variables/user_variables.cc @@ -16,7 +16,7 @@ #define MYSQL_SERVER #include <my_global.h> #include <sql_class.h> -#include <table.h> +#include <sql_i_s.h> #include <sql_show.h> @@ -42,16 +42,18 @@ static const LEX_CSTRING unsigned_result_types[]= }; +namespace Show { + static ST_FIELD_INFO user_variables_fields_info[] = { - { "VARIABLE_NAME", NAME_CHAR_LEN, MYSQL_TYPE_STRING, 0, 0, "Variable_name", 0 }, - { "VARIABLE_VALUE", 2048, MYSQL_TYPE_STRING, 0, MY_I_S_MAYBE_NULL, "Value", 0 }, - { "VARIABLE_TYPE", NAME_CHAR_LEN, MYSQL_TYPE_STRING, 0, 0, 0, 0 }, - { "CHARACTER_SET_NAME", MY_CS_NAME_SIZE, MYSQL_TYPE_STRING, 0, - MY_I_S_MAYBE_NULL, 0, 0 }, - { 0, 0, MYSQL_TYPE_NULL, 0, 0, 0, 0 } + Column("VARIABLE_NAME", Name(), NOT_NULL, "Variable_name"), + Column("VARIABLE_VALUE", Varchar(2048), NULLABLE, "Value"), + Column("VARIABLE_TYPE", Name(), NOT_NULL), + Column("CHARACTER_SET_NAME", CSName(), NULLABLE), + CEnd() }; +} // namespace Show static int user_variables_fill(THD *thd, TABLE_LIST *tables, COND *cond) { @@ -110,7 +112,7 @@ int user_variables_reset(void) static int user_variables_init(void *p) { ST_SCHEMA_TABLE *is= (ST_SCHEMA_TABLE *) p; - is->fields_info= user_variables_fields_info; + is->fields_info= Show::user_variables_fields_info; is->fill_table= user_variables_fill; is->reset_table= user_variables_reset; return 0; |