MDEV-14747 ALTER PARTITION BY SYSTEM_TIME after LOCK TABLES

MariaDB · Dec 26, 2017 · 11c6882 · 11c6882
1 parent 4236f58
commit 11c6882
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/mysql-test/suite/versioning/r/partition.result b/mysql-test/suite/versioning/r/partition.result
@@ -366,5 +366,11 @@ partition pn current);
 set autocommit= off;
 truncate table t1;
 set autocommit= on;
+MDEV-14747 ALTER PARTITION BY SYSTEM_TIME after LOCK TABLES
+create or replace table t1 (x int) with system versioning;
+lock table t1 write;
+alter table t1 partition by system_time interval 1 week (
+partition p1 history,
+partition pn current);
 drop table t1;
 drop table t2;
diff --git a/mysql-test/suite/versioning/t/partition.test b/mysql-test/suite/versioning/t/partition.test
@@ -314,6 +314,13 @@ set autocommit= off;
 truncate table t1;
 set autocommit= on;
 
+--echo MDEV-14747 ALTER PARTITION BY SYSTEM_TIME after LOCK TABLES
+create or replace table t1 (x int) with system versioning;
+lock table t1 write;
+alter table t1 partition by system_time interval 1 week (
+  partition p1 history,
+  partition pn current);
+
 drop table t1;
 drop table t2;
 

diff --git a/sql/partition_info.cc b/sql/partition_info.cc
@@ -1057,9 +1057,13 @@ class Table_locker
   {
     DBUG_ASSERT(table.file);
     // FIXME: check consistency with table.reginfo.lock_type
-    if (table.file->get_lock_type() != F_UNLCK)
+    if (table.file->get_lock_type() != F_UNLCK
+      || table.s->tmp_table)
+    {
       return false;
+    }
     thd->lock= NULL;
+    thd->locked_tables_mode= LTM_NONE;
     bool res= lock_tables(thd, &table_list, 1, 0);
     locked= !res;
     return res;