mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Build fixes:

Browse source 
- Fix signed/unsigned warning (error -Werror) in readline
- change regex_replace pattern to account for forward or backward slashes 
   in partition_recover_myisam ( fixes Windows/embedded)
This commit is contained in:
Vladislav Vaintroub 2011-02-26 18:46:16 +01:00
parent c1bb298e36
commit 8b6eb98f78
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd-line-utils/readline/terminal.c
View file

@ -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");
}

4
mysql-test/suite/parts/r/partition_recover_myisam.result
View file

@ -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

4
mysql-test/suite/parts/t/partition_recover_myisam.test
View file

@ -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