diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-08-08 12:21:04 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-08-08 12:21:04 -0400 |
| commit | 3250963e7b2f5145bf837d03a1d9ac6cd3cb51c9 (patch) | |
| tree | 43c6e6c692907658893a31e6b94ec334d88e4e8b /mysys/mf_iocache2.c | |
| parent | aa7519299a307e06f2a155b879fa59699854a1da (diff) | |
| download | mariadb-git-3250963e7b2f5145bf837d03a1d9ac6cd3cb51c9.tar.gz | |
Correct bad merge, and remove version numbers from test case.
mysql-test/r/mysqlbinlog2.result:
Change test case to remove server version number.
mysql-test/t/mysqlbinlog2.test:
Change test case to remove server version number.
mysys/mf_iocache2.c:
Correcting bad merge.
Diffstat (limited to 'mysys/mf_iocache2.c')
| -rw-r--r-- | mysys/mf_iocache2.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysys/mf_iocache2.c b/mysys/mf_iocache2.c index 39110445481..c54c7d13548 100644 --- a/mysys/mf_iocache2.c +++ b/mysys/mf_iocache2.c @@ -415,6 +415,7 @@ process_flags: if (*fmt == 'd') length2= (size_t) (int10_to_str((long) iarg,buff, -10) - buff); else + length2= (uint) (int10_to_str((long) (uint) iarg,buff,10)- buff); /* minimum width padding */ if (minimum_width > length2) |