diff options
author | Michael Widenius <monty@askmonty.org> | 2012-06-27 17:13:12 +0300 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2012-06-27 17:13:12 +0300 |
commit | 44d8fe96461c0605a53159fcdc4bf04a8e5c52b3 (patch) | |
tree | 84fb5f36d2cc6b0086581a8d134ad4422e37910c /mysql-test | |
parent | 072097174c8b91299fe74a3cd7c5248e6e3cfc57 (diff) | |
download | mariadb-git-44d8fe96461c0605a53159fcdc4bf04a8e5c52b3.tar.gz |
Don't abort InnoDB/XtraDB if one can't allocate resources for AIO
- Better error messages
This fixes that one again can run the test systems with many threads without having to increase fs.aio-max-nr.
mysql-test/include/mtr_check.sql:
Ignore the INNODB_USE_NATIVE_AIO variable (may change during execution)
mysql-test/mysql-test-run.pl:
Ignore warnings for failure to setup AIO
storage/innobase/os/os0file.c:
Continue without AIO even if we can't allocate resources for AIO
storage/xtradb/os/os0file.c:
Continue without AIO even if we can't allocate resources for AIO
storage/xtradb/srv/srv0start.c:
Give an error message (instead of core dump) if AIO can't be initialized
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/include/mtr_check.sql | 1 | ||||
-rwxr-xr-x | mysql-test/mysql-test-run.pl | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/include/mtr_check.sql b/mysql-test/include/mtr_check.sql index 82c0514b7cd..6c1a3513324 100644 --- a/mysql-test/include/mtr_check.sql +++ b/mysql-test/include/mtr_check.sql @@ -30,6 +30,7 @@ BEGIN WHERE variable_name NOT IN ('timestamp', 'innodb_file_format_max') AND variable_name not like "Last_IO_Err*" AND variable_name != 'INNODB_IBUF_MAX_SIZE' + AND variable_name != 'INNODB_USE_NATIVE_AIO' ORDER BY variable_name; -- Dump all databases, there should be none diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 6e463f35bf5..a2802916fe4 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -4738,6 +4738,9 @@ sub extract_warning_lines ($$) { qr|Aborted connection|, qr|table.*is full|, qr|Linux Native AIO|, # warning that aio does not work on /dev/shm + qr|Error: io_setup\(\) failed|, + qr|Warning: io_setup\(\) failed|, + qr|Warning: io_setup\(\) attempt|, ); my $matched_lines= []; |