diff options
author | Sergei Golubchik <serg@mariadb.org> | 2019-04-05 13:02:51 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2019-04-24 11:15:38 +0200 |
commit | 822071ca5b6d109e5497f1c15efa44fe47d277c5 (patch) | |
tree | bb717639ab208c48c8d549c2e9452f559ce8f692 /sql/sql_acl.cc | |
parent | 66099b8f2d10cedf4ee75d12c0188f3a9b383e6c (diff) | |
download | mariadb-git-822071ca5b6d109e5497f1c15efa44fe47d277c5.tar.gz |
MDEV-18241 Downgrade from 10.4 to 10.3 crashes
privilege tables can never be views or temporary tables,
don't even try to open them, if they are.
Diffstat (limited to 'sql/sql_acl.cc')
-rw-r--r-- | sql/sql_acl.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 19ecd870307..5d7f82ff5dd 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -1155,8 +1155,12 @@ static void fix_table_list(TABLE_LIST *tl, uint n) TABLE_LIST *end; for (end= tl + n - 1; tl < end; tl++) { + tl->i_s_requested_object= OPEN_TABLE_ONLY; + tl->open_type= OT_BASE_ONLY; tl->next_local= tl->next_global= tl + 1; } + tl->i_s_requested_object= OPEN_TABLE_ONLY; + tl->open_type= OT_BASE_ONLY; } |