diff options
| author | Lars Tangvald <lars.tangvald@oracle.com> | 2017-05-19 06:14:49 (GMT) |
|---|---|---|
| committer | Lars Tangvald <lars.tangvald@oracle.com> | 2017-05-19 06:14:49 (GMT) |
| commit | 2f13c610e43b89566e0bd0501c19d4edf9258f59 (patch) | |
| tree | 8c80989b469dc5387dd2187a22c98af289e9011c | |
| parent | 4dfdeaaf248ea819374807daf4538fe9308e427a (diff) | |
Fix failing test main.mysql_not_windows
The test tries to set open file limit to the "unreasonably high" 1M,
expecting it to fail, but on Artful the limit is above this.
Patch changes the value to 10M.
Upstream bug: https://bugs.mysql.com/bug.php?id=86372
| -rw-r--r-- | debian/patches/fix_test_mysql_not_windows.patch | 50 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 51 insertions, 0 deletions
diff --git a/debian/patches/fix_test_mysql_not_windows.patch b/debian/patches/fix_test_mysql_not_windows.patch new file mode 100644 index 0000000..0e2a94a --- /dev/null +++ b/debian/patches/fix_test_mysql_not_windows.patch @@ -0,0 +1,50 @@ +Description: Fixes failing test main.mysql_not_windows + The test sets the server's open file limit to the high value 1M, expecting + the operation to fail due to it being higher than the system's hard limit, + but Artful currently has a hard limit of 1048576, the test fails. + Patch increases the value to 10M +Author: Lars Tangvald <lars.tangvald@oracle.com> +Bug: https://bugs.mysql.com/bug.php?id=86372 +Forwarded: not-needed +Last-Update: 2017-05-19 + +--- mysql-5.7-5.7.18.orig/mysql-test/r/mysql_not_windows.result ++++ mysql-5.7-5.7.18/mysql-test/r/mysql_not_windows.result +@@ -6,10 +6,10 @@ a + # + # Filtering out the warning since platforms Solaris and osx set the + # open_files_limit to too low a value after setrlimit fails to set +-# open_files_limit to 1000000 ++# open_files_limit to 10000000 + CALL mtr.add_suppression("innodb_open_files should not be greater than the open_files_limit."); +-SELECT @@open_files_limit = 1000000; +-@@open_files_limit = 1000000 ++SELECT @@open_files_limit = 10000000; ++@@open_files_limit = 10000000 + 0 + + End of tests +--- mysql-5.7-5.7.18.orig/mysql-test/t/mysql_not_windows-master.opt ++++ mysql-5.7-5.7.18/mysql-test/t/mysql_not_windows-master.opt +@@ -1 +1 @@ +---open_files_limit=1000000 ++--open_files_limit=10000000 +--- mysql-5.7-5.7.18.orig/mysql-test/t/mysql_not_windows.test ++++ mysql-5.7-5.7.18/mysql-test/t/mysql_not_windows.test +@@ -17,13 +17,13 @@ + --echo # + --echo # Filtering out the warning since platforms Solaris and osx set the + --echo # open_files_limit to too low a value after setrlimit fails to set +---echo # open_files_limit to 1000000 ++--echo # open_files_limit to 10000000 + + CALL mtr.add_suppression("innodb_open_files should not be greater than the open_files_limit."); + +-# .opt file tries to set limit to 1000000, but this should not work ++# .opt file tries to set limit to 10000000, but this should not work + # so that the SELECT below should return 0. +-SELECT @@open_files_limit = 1000000; ++SELECT @@open_files_limit = 10000000; + + --echo + --echo End of tests diff --git a/debian/patches/series b/debian/patches/series index 85ef7ed..b015c34 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ mysql-test-run-paths removedojo.patch fix_failing_test.patch fix_grant_user_lock_as_root.patch +fix_test_mysql_not_windows.patch |