From 822071ca5b6d109e5497f1c15efa44fe47d277c5 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Fri, 5 Apr 2019 13:02:51 +0200
Subject: 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.
---
 sql/sql_acl.cc | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'sql/sql_acl.cc')

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;
 }
 
 
-- 
cgit v1.2.1