MDEV-23298 Assertion `table_list->prelocking_placeholder == TABLE_LIST::PRELOCK_NONE' failed in check_lock_and_start_stmt on CREATE OR REPLACE TABLE

Fixed by removing wrong assert

Review: Sanja Byelkin

Author: montywi

mysql-test/main/create_or_replace.result

@@ -582,3 +582,32 @@ DROP TABLE IF EXISTS tm, t;
 #
 # End of 10.4 tests
 SET GLOBAL innodb_stats_persistent=@save_persistent;
+#
+# MDEV-23298 Assertion `table_list->prelocking_placeholder ==
+# TABLE_LIST::PRELOCK_NONE' failed in check_lock_and_start_stmt on
+# CREATE OR REPLACE TABLE
+#
+create table t2 (a int);
+insert into t2 values(1),(2);
+CREATE TABLE t1 (a INT);
+CREATE OR REPLACE TABLE t1 AS SELECT sys.format_statement('SELECT 1') AS q;
+drop table t1;
+CREATE TABLE t1 (a INT);
+CREATE OR REPLACE TABLE t1 AS SELECT sys.format_statement('SELECT 1') AS q, t2.a from t2;
+SELECT * from t1;
+q	a
+SELECT 1	1
+SELECT 1	2
+drop table t1;
+CREATE TABLE t1 (a INT);
+lock table t1 write,t2 read, sys.sys_config read;
+CREATE OR REPLACE TABLE t1 AS SELECT sys.format_statement('SELECT 1') AS q, t2.a from t2;
+unlock tables;
+select * from t1;
+q	a
+SELECT 1	1
+SELECT 1	2
+drop table t1,t2;
+#
+# End of 10.6 tests
+#

mysql-test/main/create_or_replace.test

@@ -532,3 +532,29 @@ DROP TABLE IF EXISTS tm, t;
 --echo # End of 10.4 tests
 
 SET GLOBAL innodb_stats_persistent=@save_persistent;
+
+--echo #
+--echo # MDEV-23298 Assertion `table_list->prelocking_placeholder ==
+--echo # TABLE_LIST::PRELOCK_NONE' failed in check_lock_and_start_stmt on
+--echo # CREATE OR REPLACE TABLE
+--echo #
+
+create table t2 (a int);
+insert into t2 values(1),(2);
+CREATE TABLE t1 (a INT);
+CREATE OR REPLACE TABLE t1 AS SELECT sys.format_statement('SELECT 1') AS q;
+drop table t1;
+CREATE TABLE t1 (a INT);
+CREATE OR REPLACE TABLE t1 AS SELECT sys.format_statement('SELECT 1') AS q, t2.a from t2;
+SELECT * from t1;
+drop table t1;
+CREATE TABLE t1 (a INT);
+lock table t1 write,t2 read, sys.sys_config read;
+CREATE OR REPLACE TABLE t1 AS SELECT sys.format_statement('SELECT 1') AS q, t2.a from t2;
+unlock tables;
+select * from t1;
+drop table t1,t2;
+
+--echo #
+--echo # End of 10.6 tests
+--echo #

sql/sql_base.cc

@@ -5157,12 +5157,6 @@ static bool check_lock_and_start_stmt(THD *thd,
   thr_lock_type lock_type;
   DBUG_ENTER("check_lock_and_start_stmt");
 
-  /*
-    Prelocking placeholder is not set for TABLE_LIST that
-    are directly used by TOP level statement.
-  */
-  DBUG_ASSERT(table_list->prelocking_placeholder == TABLE_LIST::PRELOCK_NONE);
-
   /*
     TL_WRITE_DEFAULT and TL_READ_DEFAULT are supposed to be parser only
     types of locks so they should be converted to appropriate other types