MDEV-13720 Server crashes in SEQUENCE::write_lock for temporary tables

This happens when doing NEXT VALUE for a temporary table Fixed by giving ER_NOT_SEQUENCE when trying to use normal temporary table with sequence functions Signed-off-by: Monty <monty@mariadb.org>
MariaDB · Oct 22, 2017 · 1355fad · 1355fad
1 parent eea07f5
commit 1355fad
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/mysql-test/suite/sql_sequence/next.result b/mysql-test/suite/sql_sequence/next.result
@@ -512,3 +512,10 @@ def					PREVIOUS VALUE FOR s1	8	20	1	Y	32896	0	63
 NEXT VALUE FOR s1	PREVIOUS VALUE FOR s1
 1	1
 DROP SEQUENCE s1;
+#
+# MDEV-13720 ER_NOT_SEQUENCE for temporary table
+#
+create temporary table tmp (i int);
+select next value for tmp;
+ERROR 42S02: 'test.tmp' is not a SEQUENCE
+drop table tmp;
diff --git a/mysql-test/suite/sql_sequence/next.test b/mysql-test/suite/sql_sequence/next.test
@@ -260,3 +260,12 @@ SELECT
 DROP SEQUENCE s1;
 --enable_ps_protocol
 --disable_metadata
+
+--echo #
+--echo # MDEV-13720 ER_NOT_SEQUENCE for temporary table
+--echo #
+
+create temporary table tmp (i int);
+--error ER_NOT_SEQUENCE
+select next value for tmp;
+drop table tmp;
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
@@ -3341,6 +3341,11 @@ open_and_process_table(THD *thd, LEX *lex, TABLE_LIST *tables,
       temporary table or SEQUENCE (see sequence_insert()).
     */
     DBUG_ASSERT(is_temporary_table(tables) || tables->table->s->sequence);
+    if (tables->sequence && tables->table->s->table_type != TABLE_TYPE_SEQUENCE)
+    {
+        my_error(ER_NOT_SEQUENCE, MYF(0), tables->db, tables->alias);
+        DBUG_RETURN(true);
+    }
   }
   else if (tables->open_type == OT_TEMPORARY_ONLY)
   {