MDEV-16686 DDL in procedure propagates no locking to tables locked by DML

TABLE_LIST parsed from procedure code is transferred into tables to
lock for INSERT. The procedure code is CREATE VIEW so its TABLE_LIST
is parsed as TL_IGNORE, but same view exists and when existing view is
opened mysql_make_view() uses same TABLE_LIST that was initialized
from CREATE VIEW and then added as part of prelocking context. So
existing view is opened and its table is assigned TL_IGNORE from
prelocking context. Finally, INSERT has TABLE_LIST duplication: the
one that was parsed from INSERT; the another one came from procedure
prelocking, its lock_type came from the procedure code and the real
table was found via existing view.

The sequence of execution:

1. Procedure p is compiled as part of open_and_process_routine(), its
   code is parsed and create_or_alter_view_finalize() initializes v
   TABLE_LIST as TL_IGNORE;
2. Procedure p prelocking adds v to prelocking_ctx with TL_IGNORE;
3. DML prelocking adds v from prelocking_ctx;
4. View is opened, mysql_make_view() assigns t lock_type from v;
5. open_and_lock_tables() attempts to lock t with TL_IGNORE.

The fix skips TL_IGNORE at 2. when table list parsed by procedure is
added for prelocking:

        if (my_hash_insert(&m_sptabs, (uchar *)tab))
          return FALSE;

m_sptabs designation was defined as strictly for prelocking:

  /**
    Multi-set representing optimized list of tables to be locked by this
    routine. Does not include tables which are used by invoked routines.

    @note
    For prelocking-free SPs this multiset is constructed too.
    We do so because the same instance of sp_head may be called both
    in prelocked mode and in non-prelocked mode.
  */
  HASH m_sptabs;

The fix was proposed by Sergei Golubchik <serg@mariadb.org>.

Author: midenok

mysql-test/main/tablelock.result

@@ -55,3 +55,74 @@ f1	int(11)	YES		NULL
 insert into t1 values(2);
 drop table t1;
 unlock tables;
+#
+# Bug#19988193 ASSERTION `(*TABLES)->REGINFO.LOCK_TYPE >= TL_READ'
+# FAILED IN LOCK_EXTERNAL
+#
+CREATE TABLE t1(a INT);
+CREATE PROCEDURE p1() CREATE VIEW v1 AS SELECT * FROM t1;
+
+# Create trigger calling proc creating view, when view DOES NOT
+# exist already
+CREATE TRIGGER trg_p1_t1 AFTER INSERT ON t1 FOR EACH ROW CALL p1();
+
+# Verify that it is possible to lock table
+LOCK TABLES t1 WRITE;
+UNLOCK TABLES;
+
+# Fails, as expected
+INSERT INTO t1 VALUES (1);
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
+
+# Make sure v1 already exists
+CREATE VIEW v1 AS SELECT a+1 FROM t1;
+
+# Verify that it is possible to lock table
+LOCK TABLES t1 WRITE;
+UNLOCK TABLES;
+
+# Verify that we get the expected error when inserting into the table
+INSERT INTO t1 VALUES (1);
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
+
+# Cleanup
+DROP TRIGGER trg_p1_t1;
+DROP PROCEDURE p1;
+DROP VIEW v1;
+DROP TABLE t1;
+#
+# Bug#21198646 ASSERTION FAILED: (*TABLES)->REGINFO.LOCK_TYPE >= TL_READ
+# FILE LOCK.CC, LINE 356
+#
+CREATE TABLE t2(a INT);
+# Create procedure p1 invoking RENAME TABLE
+CREATE PROCEDURE p1() RENAME TABLE t2 TO t3;
+# Create function f1 calling p1
+CREATE FUNCTION f1() RETURNS INT BEGIN CALL p1(); RETURN 1; END $
+# Invoke function f1 and verify that we get the expected error
+SELECT f1();
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
+# Cleanup
+DROP PROCEDURE p1;
+DROP FUNCTION f1;
+DROP TABLE t2;
+#
+# MDEV-16686 DDL in procedure propagates no locking to tables locked by DML
+#
+create table t (i int);
+create view v as select * from t;
+create procedure p() create view v as select * from t;
+create trigger tr after insert on t for each row call p();
+insert into t values (1), (2);
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
+drop procedure p;
+drop view v;
+drop table t;
+CREATE TABLE t (a INT);
+CREATE PROCEDURE p() RENAME TABLE t TO t2;
+CREATE TRIGGER tt AFTER INSERT ON t FOR EACH ROW CALL p();
+INSERT INTO t VALUES (0);
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
+drop procedure p;
+drop table t;
+# End of 10.11 tests

mysql-test/main/tablelock.test

@@ -1,3 +1,5 @@
+--source include/have_innodb.inc
+
 #
 # Test of lock tables
 #
@@ -62,3 +64,91 @@ drop table t1;
 unlock tables;
 
 # End of 5.0 tests
+
+
+--echo #
+--echo # Bug#19988193 ASSERTION `(*TABLES)->REGINFO.LOCK_TYPE >= TL_READ'
+--echo # FAILED IN LOCK_EXTERNAL
+--echo #
+
+CREATE TABLE t1(a INT);
+CREATE PROCEDURE p1() CREATE VIEW v1 AS SELECT * FROM t1;
+--echo
+--echo # Create trigger calling proc creating view, when view DOES NOT
+--echo # exist already
+CREATE TRIGGER trg_p1_t1 AFTER INSERT ON t1 FOR EACH ROW CALL p1();
+--echo
+--echo # Verify that it is possible to lock table
+LOCK TABLES t1 WRITE;
+UNLOCK TABLES;
+--echo
+--echo # Fails, as expected
+--error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
+INSERT INTO t1 VALUES (1);
+--echo
+--echo # Make sure v1 already exists
+CREATE VIEW v1 AS SELECT a+1 FROM t1;
+--echo
+--echo # Verify that it is possible to lock table
+LOCK TABLES t1 WRITE;
+UNLOCK TABLES;
+--echo
+--echo # Verify that we get the expected error when inserting into the table
+--error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
+INSERT INTO t1 VALUES (1);
+--echo
+--echo # Cleanup
+DROP TRIGGER trg_p1_t1;
+DROP PROCEDURE p1;
+DROP VIEW v1;
+DROP TABLE t1;
+
+
+--echo #
+--echo # Bug#21198646 ASSERTION FAILED: (*TABLES)->REGINFO.LOCK_TYPE >= TL_READ
+--echo # FILE LOCK.CC, LINE 356
+--echo #
+
+CREATE TABLE t2(a INT);
+
+--echo # Create procedure p1 invoking RENAME TABLE
+CREATE PROCEDURE p1() RENAME TABLE t2 TO t3;
+
+--echo # Create function f1 calling p1
+DELIMITER $;
+CREATE FUNCTION f1() RETURNS INT BEGIN CALL p1(); RETURN 1; END $
+DELIMITER ;$
+
+--echo # Invoke function f1 and verify that we get the expected error
+--error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
+SELECT f1();
+
+--echo # Cleanup
+DROP PROCEDURE p1;
+DROP FUNCTION f1;
+DROP TABLE t2;
+
+--echo #
+--echo # MDEV-16686 DDL in procedure propagates no locking to tables locked by DML
+--echo #
+create table t (i int);
+create view v as select * from t;
+create procedure p() create view v as select * from t;
+create trigger tr after insert on t for each row call p();
+--error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
+insert into t values (1), (2);
+
+# cleanup
+drop procedure p;
+drop view v;
+drop table t;
+
+CREATE TABLE t (a INT);
+CREATE PROCEDURE p() RENAME TABLE t TO t2;
+CREATE TRIGGER tt AFTER INSERT ON t FOR EACH ROW CALL p();
+--error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
+INSERT INTO t VALUES (0);
+drop procedure p;
+drop table t;
+
+--echo # End of 10.11 tests

sql/sp_head.cc

@@ -5122,7 +5122,8 @@ sp_head::merge_table_list(THD *thd, TABLE_LIST *table, LEX *lex_for_tmp_check)
   }
 
   for (; table ; table= table->next_global)
-    if (!table->derived && !table->schema_table && !table->table_function)
+    if (!table->derived && !table->schema_table && !table->table_function &&
+        table->lock_type != TL_IGNORE)
     {
       /*
         Structure of key for the multi-set is "db\0table\0alias\0".

sql/sql_base.cc

@@ -5925,6 +5925,7 @@ bool lock_tables(THD *thd, TABLE_LIST *tables, uint count, uint flags)
         found_first_not_own= 1;
       if (!table->placeholder())
       {
+        DBUG_ASSERT(table->lock_type != TL_IGNORE);
         *(ptr++)= table->table;
         if (!found_first_not_own)
           table->table->query_id= thd->query_id;