From 3250963e7b2f5145bf837d03a1d9ac6cd3cb51c9 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 8 Aug 2007 12:21:04 -0400 Subject: 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. --- mysys/mf_iocache2.c | 1 + 1 file changed, 1 insertion(+) (limited to 'mysys/mf_iocache2.c') 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) -- cgit v1.2.1