diff --git a/cmd-line-utils/readline/terminal.c b/cmd-line-utils/readline/terminal.c
index cc30f50cf3c..d7c72ca2aa5 100644
--- a/cmd-line-utils/readline/terminal.c
+++ b/cmd-line-utils/readline/terminal.c
@@ -621,7 +621,7 @@ _rl_output_some_chars (string, count)
      const char *string;
      int count;
 {
-  if (fwrite (string, 1, count, _rl_out_stream) != count)
+  if (fwrite (string, 1, count, _rl_out_stream) != (size_t)count)
     fprintf(stderr, "Write failed\n");
 }
 
diff --git a/mysql-test/suite/parts/r/partition_recover_myisam.result b/mysql-test/suite/parts/r/partition_recover_myisam.result
index df737ec2853..ccbc9a6c9ef 100644
--- a/mysql-test/suite/parts/r/partition_recover_myisam.result
+++ b/mysql-test/suite/parts/r/partition_recover_myisam.result
@@ -17,7 +17,7 @@ a
 10
 11
 Warnings:
-Error	145	Table './test/t1_will_crash' is marked as crashed and should be repaired
+Error	145	Table 't1_will_crash' is marked as crashed and should be repaired
 Error	1194	Table 't1_will_crash' is marked as crashed and should be repaired
 Error	1034	1 client is using or hasn't closed the table properly
 Error	1034	Size of indexfile is: 1024        Should be: 2048
@@ -47,7 +47,7 @@ a
 10
 11
 Warnings:
-Error	145	Table './test/t1_will_crash#P#p1' is marked as crashed and should be repaired
+Error	145	Table 't1_will_crash#P#p1' is marked as crashed and should be repaired
 Error	1194	Table 't1_will_crash' is marked as crashed and should be repaired
 Error	1034	1 client is using or hasn't closed the table properly
 Error	1034	Size of indexfile is: 1024        Should be: 2048
diff --git a/mysql-test/suite/parts/t/partition_recover_myisam.test b/mysql-test/suite/parts/t/partition_recover_myisam.test
index f73457fc526..b001306b580 100644
--- a/mysql-test/suite/parts/t/partition_recover_myisam.test
+++ b/mysql-test/suite/parts/t/partition_recover_myisam.test
@@ -24,7 +24,7 @@ let $MYSQLD_DATADIR= `select @@datadir`;
 --remove_file $MYSQLD_DATADIR/test/t1_will_crash.MYI
 --copy_file std_data/corrupt_t1.MYI $MYSQLD_DATADIR/test/t1_will_crash.MYI
 # Embedded server doesn't chdir to data directory
---replace_regex /Table '.*\/data\/test\/t1_will_crash/Table '.\/test\/t1_will_crash/
+--replace_regex /Table '.*t1_will_crash/Table 't1_will_crash/
 --enable_prepare_warnings
 SELECT * FROM t1_will_crash;
 --disable_prepare_warnings
@@ -41,7 +41,7 @@ FLUSH TABLES;
 --remove_file $MYSQLD_DATADIR/test/t1_will_crash#P#p1.MYI
 --copy_file std_data/corrupt_t1#P#p1.MYI $MYSQLD_DATADIR/test/t1_will_crash#P#p1.MYI
 # Embedded server doesn't chdir to data directory
---replace_regex /Table '.*\/data\/test\/t1_will_crash/Table '.\/test\/t1_will_crash/
+--replace_regex /Table '.*t1_will_crash/Table 't1_will_crash/
 --enable_prepare_warnings
 SELECT * FROM t1_will_crash;
 --disable_prepare_warnings