summaryrefslogtreecommitdiff
path: root/sql/sql_show.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-07-17 14:35:04 +0200
committerSergei Golubchik <serg@mariadb.org>2018-09-04 08:37:44 +0200
commit22bcfa011acd81c44c2ad969a0edc2401a32a311 (patch)
tree165f6ab775eb9af5418970292325c87a83a817e9 /sql/sql_show.cc
parentb9bc3c24630980b260b91fc856689dbad336064e (diff)
downloadmariadb-git-22bcfa011acd81c44c2ad969a0edc2401a32a311.tar.gz
cleanup: FOREIGN_KEY_INFO
instead of returning strings for CASCADE/RESTRICT from every storage engine, use enum values Backport of a3614d33e8a
Diffstat (limited to 'sql/sql_show.cc')
-rw-r--r--sql/sql_show.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index cdcd6fe47e3..9c2cef80d61 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -7534,6 +7534,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)
@@ -7578,10 +7579,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);
}