diff options
author | Rich Prohaska <prohaska@tokutek.com> | 2014-12-03 12:29:27 -0500 |
---|---|---|
committer | Rich Prohaska <prohaska@tokutek.com> | 2014-12-03 12:29:27 -0500 |
commit | d9e7ab6fc2628395bb5b388d2c0d9c94ee1450a9 (patch) | |
tree | 0a0670d3243b7d99343021335a9a79c49adec957 | |
parent | 9eb57b143726a99e9bcedec87e4b34b6c8db9dab (diff) | |
parent | e790efdf80efec0e523dca42e63a016e5dde3326 (diff) | |
download | mariadb-git-d9e7ab6fc2628395bb5b388d2c0d9c94ee1450a9.tar.gz |
Merge branch 'master' into releases/tokudb-7.5
-rw-r--r-- | mysql-test/suite/tokudb.bugs/t/5585-master.opt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/suite/tokudb.bugs/t/5585-master.opt b/mysql-test/suite/tokudb.bugs/t/5585-master.opt new file mode 100644 index 00000000000..017432e797d --- /dev/null +++ b/mysql-test/suite/tokudb.bugs/t/5585-master.opt @@ -0,0 +1 @@ +--tokudb-cache-size=1000000000 --innodb-buffer-pool-size=1000000000 |