diff options
author | Sergei Petrunia <psergey@askmonty.org> | 2017-04-03 13:48:05 +0300 |
---|---|---|
committer | Sergei Petrunia <psergey@askmonty.org> | 2017-04-03 13:48:05 +0300 |
commit | 5e0ed6912ff6c9c5204b413ef9ea6bb9e3fd4047 (patch) | |
tree | 0a7a427cb9f6dd9f476eee09a13faba46808f1f5 /sql/sql_show.cc | |
parent | 5c66eb5c9f7f1da4a08d736ebaec161aeef9383c (diff) | |
parent | c07bb700c897ee36d97a6c694582c69959bbcaef (diff) | |
download | mariadb-git-5e0ed6912ff6c9c5204b413ef9ea6bb9e3fd4047.tar.gz |
Merge 10.2 into bb-10.2-mariarocks
Diffstat (limited to 'sql/sql_show.cc')
-rw-r--r-- | sql/sql_show.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 32e7d6f140b..d1d1410d51a 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -4667,7 +4667,7 @@ static int fill_schema_table_from_frm(THD *thd, TABLE *table, table_list.view= (LEX*) share->is_view; res= schema_table->process_table(thd, &table_list, table, res, db_name, table_name); - free_root(&tbl.mem_root, MYF(0)); + closefrm(&tbl); } |