diff options
author | Vladislav Vaintroub <vvaintroub@googlemail.com> | 2016-02-22 12:48:03 +0100 |
---|---|---|
committer | Vladislav Vaintroub <vvaintroub@googlemail.com> | 2016-02-22 12:48:03 +0100 |
commit | 3a24f1cf8426409a69619982e84ca498d581f8a1 (patch) | |
tree | 8879ea081a106ecb5bebb15f5cf43bbe5b33eb1e /sql/sql_show.cc | |
parent | ff25158d7f5a8e29c1b074631e4b98693bed343e (diff) | |
download | mariadb-git-3a24f1cf8426409a69619982e84ca498d581f8a1.tar.gz |
MDEV-9307 - provide info about DATA/INDEX directory in INFORMATION_SCHEMA.TA
BLES (in CREATE_OPTIONS column)
Diffstat (limited to 'sql/sql_show.cc')
-rw-r--r-- | sql/sql_show.cc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index d931aed475a..6aeea4b0316 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -5036,6 +5036,15 @@ static int get_schema_tables_record(THD *thd, TABLE_LIST *tables, } append_create_options(thd, &str, share->option_list, false, 0); + if (file) + { + HA_CREATE_INFO create_info; + memset(&create_info, 0, sizeof(create_info)); + file->update_create_info(&create_info); + append_directory(thd, &str, "DATA", create_info.data_file_name); + append_directory(thd, &str, "INDEX", create_info.index_file_name); + } + if (str.length()) table->field[19]->store(str.ptr()+1, str.length()-1, cs); @@ -8300,8 +8309,8 @@ ST_FIELD_INFO tables_fields_info[]= OPEN_FRM_ONLY}, {"CHECKSUM", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0, (MY_I_S_MAYBE_NULL | MY_I_S_UNSIGNED), "Checksum", OPEN_FULL_TABLE}, - {"CREATE_OPTIONS", 255, MYSQL_TYPE_STRING, 0, 1, "Create_options", - OPEN_FRM_ONLY}, + {"CREATE_OPTIONS", 2048, MYSQL_TYPE_STRING, 0, 1, "Create_options", + OPEN_FULL_TABLE}, {"TABLE_COMMENT", TABLE_COMMENT_MAXLEN, MYSQL_TYPE_STRING, 0, 0, "Comment", OPEN_FRM_ONLY}, {0, 0, MYSQL_TYPE_STRING, 0, 0, 0, SKIP_OPEN_TABLE} |