Merge branch 'master' into releases/tokudb-7.5

d7d49e20 · Rich Prohaska · 4f94e06b · c88eed4b · d7d49e20
Commit d7d49e20 authored Dec 03, 2014 by Rich Prohaska
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

mysql-test/suite/tokudb.bugs/t/5585-master.opt mysql-test/suite/tokudb.bugs/t/5585-master.opt +1 -0

No files found.
--- a/mysql-test/suite/tokudb.bugs/t/5585-master.opt
+++ b/mysql-test/suite/tokudb.bugs/t/5585-master.opt
+--tokudb-cache-size=1000000000 --innodb-buffer-pool-size=1000000000