diff options
author | Sergey Petrunya <psergey@askmonty.org> | 2010-10-10 17:18:11 +0300 |
---|---|---|
committer | Sergey Petrunya <psergey@askmonty.org> | 2010-10-10 17:18:11 +0300 |
commit | 72dd7575cd8b9372ddb79cc4c94050e4ee1e5ee1 (patch) | |
tree | 220c965bb467b020a4db171d7803586f9ed22cea /mysql-test/t/bug46080-master.opt | |
parent | cfbd9270243e4b429cdc26e8554bcc99690f2422 (diff) | |
parent | 00a2f36bbf22a4d8b2367724e7919c0603cf6f71 (diff) | |
download | mariadb-git-72dd7575cd8b9372ddb79cc4c94050e4ee1e5ee1.tar.gz |
Merge 5.2->5.3
- Re-commit Monty's merge, partially fixed by Igor and SergeyP,
but still broken
Diffstat (limited to 'mysql-test/t/bug46080-master.opt')
-rw-r--r-- | mysql-test/t/bug46080-master.opt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/bug46080-master.opt b/mysql-test/t/bug46080-master.opt index dacdab53a4b..b1c244a121c 100644 --- a/mysql-test/t/bug46080-master.opt +++ b/mysql-test/t/bug46080-master.opt @@ -1 +1 @@ ---skip-grant-tables --skip-name-resolve --safemalloc-mem-limit=20000000 +--skip-grant-tables --skip-name-resolve --safemalloc-mem-limit=20000000 --loose-aria-pagecache-buffer-size=1M |