diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-09-03 16:32:00 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-09-03 16:32:00 +0200 |
| commit | a5b0a32ac3f8278a197add2efa636c6252ce6096 (patch) | |
| tree | 006ccc320544e04be6beca0e929eb9f9d8e36bcd /sql/sql_show.cc | |
| parent | 09307c443c173fc2756169290b6ce0ba2f679b9a (diff) | |
| parent | f533b2b462b5b73630245172b627506d36f95b39 (diff) | |
| download | mariadb-git-a5b0a32ac3f8278a197add2efa636c6252ce6096.tar.gz | |
Merge branch '10.0-galera' into 10.1
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 28e623f3af1..78d4575a51e 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -2196,8 +2196,11 @@ static void store_key_options(THD *thd, String *packet, TABLE *table, void view_store_options(THD *thd, TABLE_LIST *table, String *buff) { - buff->append(STRING_WITH_LEN("ALGORITHM=")); - buff->append(view_algorithm(table)); + if (table->algorithm != VIEW_ALGORITHM_INHERIT) + { + buff->append(STRING_WITH_LEN("ALGORITHM=")); + buff->append(view_algorithm(table)); + } buff->append(' '); append_definer(thd, buff, &table->definer.user, &table->definer.host); if (table->view_suid) |