diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-10-09 17:21:46 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-10-09 17:21:46 +0200 |
| commit | 86ff4da14dc53659e88ee8cd66412045dcb26e31 (patch) | |
| tree | 20c7b23d709799f0ba891c5aa0373fe608019970 /storage/innobase/include/ibuf0ibuf.ic | |
| parent | 56544122c75578a23a728e6acafc72dfc449484e (diff) | |
| download | mariadb-git-86ff4da14dc53659e88ee8cd66412045dcb26e31.tar.gz | |
5.6.27
Diffstat (limited to 'storage/innobase/include/ibuf0ibuf.ic')
| -rw-r--r-- | storage/innobase/include/ibuf0ibuf.ic | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/innobase/include/ibuf0ibuf.ic b/storage/innobase/include/ibuf0ibuf.ic index 21747fdceac..a5df9f7b6b4 100644 --- a/storage/innobase/include/ibuf0ibuf.ic +++ b/storage/innobase/include/ibuf0ibuf.ic @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1997, 2013, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1997, 2015, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -128,7 +128,8 @@ ibuf_should_try( && ibuf->max_size != 0 && !dict_index_is_clust(index) && index->table->quiesce == QUIESCE_NONE - && (ignore_sec_unique || !dict_index_is_unique(index))); + && (ignore_sec_unique || !dict_index_is_unique(index)) + && srv_force_recovery < SRV_FORCE_NO_IBUF_MERGE); } /******************************************************************//** |