diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-04-27 08:34:35 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-04-27 08:34:35 +0200 |
| commit | cf225145912508644fe00100afbc957aeff8aa87 (patch) | |
| tree | 38219e77a4c9b9e66eb2b52b112e1e8d4cd118d2 /storage | |
| parent | 8b1563eac8dfeedfd8f2035f0ed1f8a35115db3a (diff) | |
| download | mariadb-git-cf225145912508644fe00100afbc957aeff8aa87.tar.gz | |
after-merge fixes for failures in buildbot
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 0c3a04fe753..99ca76e2269 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -3498,13 +3498,11 @@ innobase_change_buffering_inited_ok: } } - if (innobase_open_files > (long) open_files_limit) { + if (innobase_open_files > (long) tc_size) { fprintf(stderr, "innodb_open_files should not be greater" " than the open_files_limit.\n"); - if (innobase_open_files > (long) tc_size) { - innobase_open_files = tc_size; - } + innobase_open_files = tc_size; } srv_max_n_open_files = (ulint) innobase_open_files; |