diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-18 23:19:19 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-18 23:19:19 +0300 |
| commit | dedfdb490ba528ddf3f9155a4fb6f0b3728df149 (patch) | |
| tree | d38210df12297fa40d9edbf59cbb72329a4ccad4 /mysql-test/t/bug46080-master.opt | |
| parent | 7917f0852f57ff0fecb80f561eccd674a4e1866d (diff) | |
| parent | dccf2acceab7a3ed125c0d9c11330fe5f6898a1f (diff) | |
| download | mariadb-git-dedfdb490ba528ddf3f9155a4fb6f0b3728df149.tar.gz | |
Manual merge from mysql-next-mr.
Conflicts:
- sql/sql_plugin.cc
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 f59740afe60..71024d39356 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=4000000 +--loose-performance-schema=0 --skip-grant-tables --skip-name-resolve --loose-safemalloc-mem-limit=4000000 |