Automatic merge with 5.1

mysql-test/include/mtr_check.sql

@@ -13,6 +13,7 @@ BEGIN
   -- that are supposed to change
   SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
    WHERE variable_name != 'timestamp'
+     AND variable_name not like "Last_IO_Err*"
      AND variable_name != 'INNODB_IBUF_MAX_SIZE' AND
          variable_name != 'INNODB_FILE_FORMAT_CHECK'
    ORDER BY variable_name;