diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-09-06 22:45:19 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-09-06 22:45:19 +0200 |
| commit | 31081593aabb116b6d8f86b6c7e76126edb392b4 (patch) | |
| tree | 767a069f255359b5ea37e7c491dfeacf6e519fad /sql/sql_show.cc | |
| parent | b0026e33af8fc3b25a42099c096a84591fd550e2 (diff) | |
| parent | 3a4242fd57b3a2235d2478ed080941b67a82ad1b (diff) | |
| download | mariadb-git-31081593aabb116b6d8f86b6c7e76126edb392b4.tar.gz | |
Merge branch '11.0' into 10.1
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index c029b607815..46030f96043 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -7388,6 +7388,7 @@ get_referential_constraints_record(THD *thd, TABLE_LIST *tables, LEX_STRING *db_name, LEX_STRING *table_name) { CHARSET_INFO *cs= system_charset_info; + LEX_CSTRING *s; DBUG_ENTER("get_referential_constraints_record"); if (res) @@ -7432,10 +7433,10 @@ get_referential_constraints_record(THD *thd, TABLE_LIST *tables, else table->field[5]->set_null(); table->field[6]->store(STRING_WITH_LEN("NONE"), cs); - table->field[7]->store(f_key_info->update_method->str, - f_key_info->update_method->length, cs); - table->field[8]->store(f_key_info->delete_method->str, - f_key_info->delete_method->length, cs); + s= fk_option_name(f_key_info->update_method); + table->field[7]->store(s->str, s->length, cs); + s= fk_option_name(f_key_info->delete_method); + table->field[8]->store(s->str, s->length, cs); if (schema_table_store_record(thd, table)) DBUG_RETURN(1); } |