MDEV-23764 Slave crashes in ha_storage_engine_is_enabled upon rename …

…of view view_pseudo_hton cannot be dereferenced
MariaDB · Oct 24, 2020 · 73a2ae9 · 73a2ae9
1 parent 3cd4d8d
commit 73a2ae9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/mysql-test/suite/rpl/r/rpl_create_drop_view.result b/mysql-test/suite/rpl/r/rpl_create_drop_view.result
@@ -93,7 +93,8 @@ id
 80
 40
 connection master;
-DROP VIEW v1;
+RENAME TABLE v1 TO v2;
+DROP VIEW v2;
 DROP TABLE t1;
 DROP VIEW v1;
 ERROR 42S02: Unknown VIEW: 'test.v1'

diff --git a/mysql-test/suite/rpl/t/rpl_create_drop_view.test b/mysql-test/suite/rpl/t/rpl_create_drop_view.test
@@ -38,7 +38,8 @@ SELECT * FROM t1;
 SELECT * FROM v1;
 
 connection master;
-DROP VIEW v1;
+RENAME TABLE v1 TO v2;
+DROP VIEW v2;
 DROP TABLE t1;
 
 --error ER_UNKNOWN_VIEW

diff --git a/sql/sql_rename.cc b/sql/sql_rename.cc
@@ -303,7 +303,8 @@ do_rename(THD *thd, TABLE_LIST *ren_table, const LEX_CSTRING *new_db,
     DBUG_RETURN(skip_error || if_exists ? 0 : 1);
   }
 
-  if (ha_check_if_updates_are_ignored(thd, hton, "RENAME"))
+  if (hton != view_pseudo_hton &&
+      ha_check_if_updates_are_ignored(thd, hton, "RENAME"))
   {
     /*
       Shared table. Just drop the old .frm as it's not correct anymore