after-merge fixes for failures in buildbot

mysql-test/suite/sys_vars/t/innodb_empty_free_list_algorithm_basic.opt

+--loose-innodb-buffer-pool-size=20M

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;