Commit ad1461d5 authored by Rik Prohaska's avatar Rik Prohaska

Merge branch 'master' into releases/tokudb-7.5

parents 2f926042 e1dc3624
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
source include/have_tokudb.inc; source include/have_tokudb.inc;
source include/have_innodb.inc; source include/have_innodb.inc;
source include/have_partition.inc;
disable_warnings; disable_warnings;
drop table if exists t2,t3,t4; drop table if exists t2,t3,t4;
enable_warnings; enable_warnings;
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
source include/have_tokudb.inc; source include/have_tokudb.inc;
source include/have_innodb.inc; source include/have_innodb.inc;
source include/have_partition.inc;
disable_warnings; disable_warnings;
drop table if exists t2,t3,t4; drop table if exists t2,t3,t4;
enable_warnings; enable_warnings;
......
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