after-merge fixes for failures in buildbot

MariaDB · Apr 27, 2016 · cf22514 · cf22514
1 parent 8b1563e
commit cf22514
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/mysql-test/suite/sys_vars/t/innodb_empty_free_list_algorithm_basic.opt b/mysql-test/suite/sys_vars/t/innodb_empty_free_list_algorithm_basic.opt
@@ -0,0 +1 @@
+--loose-innodb-buffer-pool-size=20M
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
@@ -3498,13 +3498,11 @@ innobase_init(
 		}
 	}
 
-	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;