Skip to content

M
MariaDB
Commit 82e942ef authored by mikael/pappa@dator5.(none)'s avatar mikael/pappa@dator5.(none)
Browse files
Options

merge fix

parent b738fd4d
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
mysql-test/t/partition.test
View file @ 82e942ef
...@@ -49,7 +49,7 @@ show table status; ...@@ -49,7 +49,7 @@ show table status;
insert into t1 values (NULL), (NULL), (NULL), (NULL); insert into t1 values (NULL), (NULL), (NULL), (NULL);
show table status; show table status;
drop table t1; drop table t1;
>>>>>>>
# #
# Bug 19309 Partitions: Crash if double procedural alter # Bug 19309 Partitions: Crash if double procedural alter
# #
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7