Automatic merge with 5.5

Fixed failing test case

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

mysql-test/mysql-test-run.pl

@@ -4739,6 +4739,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= [];

mysql-test/suite/innodb/r/innodb_bug12902967.result

@@ -1,6 +1,6 @@
 create table t1 (f1 integer primary key) engine innodb;
 alter table t1 add constraint c1 foreign key (f1) references t1(f1);
-ERROR HY000: Error on rename of '#sql-temporary' to './test/t1' (errno: 150)
+ERROR HY000: Error on rename of '#sql-temporary' to './test/t1' (errno: 150 "Foreign key constraint is incorrectly formed")
 InnoDB: has or is referenced in foreign key constraints
 InnoDB: which are not compatible with the new table definition.
 drop table t1;