diff options
| author | Sergey Vojtovich <svoj@sun.com> | 2010-10-07 19:52:34 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@sun.com> | 2010-10-07 19:52:34 +0400 |
| commit | 85d023eb382ad047ee1148d9dc8a24c67134607b (patch) | |
| tree | a618f6e40b01f1f16bdb49add08819795d0adb87 /sql/sql_show.cc | |
| parent | f6e649cfbb5fd8f9e86f5d86844689de4015cc60 (diff) | |
| parent | d9aa82154b02ec2e6bccb0048f9e0c94b6b0af6b (diff) | |
| download | mariadb-git-85d023eb382ad047ee1148d9dc8a24c67134607b.tar.gz | |
Merge WL#5496 and WL#5341 to 5.5-bugteam.
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index ba4b0ae7a0a..16deb50b17c 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -211,6 +211,11 @@ static my_bool show_plugins(THD *thd, plugin_ref plugin, } table->field[9]->set_notnull(); + table->field[10]->store( + global_plugin_typelib_names[plugin_load_option(plugin)], + strlen(global_plugin_typelib_names[plugin_load_option(plugin)]), + cs); + return schema_table_store_record(thd, table); } @@ -7214,6 +7219,7 @@ ST_FIELD_INFO plugin_fields_info[]= {"PLUGIN_AUTHOR", NAME_CHAR_LEN, MYSQL_TYPE_STRING, 0, 1, 0, SKIP_OPEN_TABLE}, {"PLUGIN_DESCRIPTION", 65535, MYSQL_TYPE_STRING, 0, 1, 0, SKIP_OPEN_TABLE}, {"PLUGIN_LICENSE", 80, MYSQL_TYPE_STRING, 0, 1, "License", SKIP_OPEN_TABLE}, + {"LOAD_OPTION", 64, MYSQL_TYPE_STRING, 0, 0, 0, SKIP_OPEN_TABLE}, {0, 0, MYSQL_TYPE_STRING, 0, 0, 0, SKIP_OPEN_TABLE} }; |